From ab219471895d802cb2fbe5a4ba90f5d4628e2864 Mon Sep 17 00:00:00 2001
From: SDKAuto <sdkautomation@microsoft.com>
Date: Fri, 11 Dec 2020 01:34:01 +0000
Subject: [PATCH] CodeGen from PR 11958 in Azure/azure-rest-api-specs Merge
 b716c042e6f30a61d9d01562d2d1bebc65151b0b into
 7b34c62199a8d84f7252dcb8b08c1b593ae65124

---
 .../operations/_subscriptions_operations.py   | 22 ++++++++-----------
 .../operations/_tenants_operations.py         |  8 +++----
 2 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/_subscriptions_operations.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/_subscriptions_operations.py
index fa1e1305cfd9..b2df9cdd0e3b 100644
--- a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/_subscriptions_operations.py
+++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/_subscriptions_operations.py
@@ -11,7 +11,6 @@
 
 import uuid
 from msrest.pipeline import ClientRawResponse
-from msrestazure.azure_exceptions import CloudError
 
 from .. import models
 
@@ -57,7 +56,8 @@ def list_locations(
         :return: An iterator like instance of Location
         :rtype:
          ~azure.mgmt.subscription.models.LocationPaged[~azure.mgmt.subscription.models.Location]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        :raises:
+         :class:`ErrorResponseBodyException<azure.mgmt.subscription.models.ErrorResponseBodyException>`
         """
         def prepare_request(next_link=None):
             if not next_link:
@@ -96,9 +96,7 @@ def internal_paging(next_link=None):
             response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
-                exp = CloudError(response)
-                exp.request_id = response.headers.get('x-ms-request-id')
-                raise exp
+                raise models.ErrorResponseBodyException(self._deserialize, response)
 
             return response
 
@@ -125,7 +123,8 @@ def get(
         :return: Subscription or ClientRawResponse if raw=true
         :rtype: ~azure.mgmt.subscription.models.Subscription or
          ~msrest.pipeline.ClientRawResponse
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        :raises:
+         :class:`ErrorResponseBodyException<azure.mgmt.subscription.models.ErrorResponseBodyException>`
         """
         # Construct URL
         url = self.get.metadata['url']
@@ -153,9 +152,7 @@ def get(
         response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
-            exp = CloudError(response)
-            exp.request_id = response.headers.get('x-ms-request-id')
-            raise exp
+            raise models.ErrorResponseBodyException(self._deserialize, response)
 
         deserialized = None
         if response.status_code == 200:
@@ -180,7 +177,8 @@ def list(
         :return: An iterator like instance of Subscription
         :rtype:
          ~azure.mgmt.subscription.models.SubscriptionPaged[~azure.mgmt.subscription.models.Subscription]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        :raises:
+         :class:`ErrorResponseBodyException<azure.mgmt.subscription.models.ErrorResponseBodyException>`
         """
         def prepare_request(next_link=None):
             if not next_link:
@@ -215,9 +213,7 @@ def internal_paging(next_link=None):
             response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
-                exp = CloudError(response)
-                exp.request_id = response.headers.get('x-ms-request-id')
-                raise exp
+                raise models.ErrorResponseBodyException(self._deserialize, response)
 
             return response
 
diff --git a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/_tenants_operations.py b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/_tenants_operations.py
index 77db5488f038..6c82456796fb 100644
--- a/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/_tenants_operations.py
+++ b/sdk/subscription/azure-mgmt-subscription/azure/mgmt/subscription/operations/_tenants_operations.py
@@ -11,7 +11,6 @@
 
 import uuid
 from msrest.pipeline import ClientRawResponse
-from msrestazure.azure_exceptions import CloudError
 
 from .. import models
 
@@ -51,7 +50,8 @@ def list(
         :return: An iterator like instance of TenantIdDescription
         :rtype:
          ~azure.mgmt.subscription.models.TenantIdDescriptionPaged[~azure.mgmt.subscription.models.TenantIdDescription]
-        :raises: :class:`CloudError<msrestazure.azure_exceptions.CloudError>`
+        :raises:
+         :class:`ErrorResponseBodyException<azure.mgmt.subscription.models.ErrorResponseBodyException>`
         """
         def prepare_request(next_link=None):
             if not next_link:
@@ -86,9 +86,7 @@ def internal_paging(next_link=None):
             response = self._client.send(request, stream=False, **operation_config)
 
             if response.status_code not in [200]:
-                exp = CloudError(response)
-                exp.request_id = response.headers.get('x-ms-request-id')
-                raise exp
+                raise models.ErrorResponseBodyException(self._deserialize, response)
 
             return response