Merge pull request #27 from Microsoft/users/tedchamb/se

handle case were service sends back a system exception rather than the proper wrapped exception

Author: tedchamb

vsts/vsts/models/__init__.py

@@ -9,6 +9,7 @@
 from ..customer_intelligence.v4_0.models.customer_intelligence_event import CustomerIntelligenceEvent
 from .improper_exception import ImproperException
 from ..location.v4_0.models.resource_area_info import ResourceAreaInfo
+from .system_exception import SystemException
 from .vss_json_collection_wrapper_base import VssJsonCollectionWrapperBase
 from .vss_json_collection_wrapper import VssJsonCollectionWrapper
 from .wrapped_exception import WrappedException
@@ -18,6 +19,7 @@
     'CustomerIntelligenceEvent',
     'ImproperException',
     'ResourceAreaInfo',
+    'SystemException',
     'VssJsonCollectionWrapperBase',
     'VssJsonCollectionWrapper',
     'WrappedException'

vsts/vsts/models/system_exception.py

@@ -0,0 +1,31 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# Generated file, DO NOT EDIT
+# Changes may cause incorrect behavior and will be lost if the code is
+# regenerated.
+# --------------------------------------------------------------------------
+
+from msrest.serialization import Model
+
+
+class SystemException(Model):
+    """SystemException.
+    :param class_name:
+    :type class_name: str
+    :param inner_exception:
+    :type inner_exception: :class:`SystemException <vsts.models.SystemException>`
+    :param message:
+    :type message: str
+    """
+
+    _attribute_map = {
+        'class_name': {'key': 'ClassName', 'type': 'str'},
+        'message': {'key': 'Message', 'type': 'str'},
+        'inner_exception': {'key': 'InnerException', 'type': 'SystemException'}
+    }
+
+    def __init__(self, class_name=None, message=None, inner_exception=None):
+        super(SystemException, self).__init__()
+        self.class_name = class_name
+        self.message = message
+        self.inner_exception = inner_exception

vsts/vsts/models/wrapped_exception.py

@@ -13,7 +13,7 @@ class WrappedException(Model):
     :param exception_id:
     :type exception_id: str
     :param inner_exception:
-    :type inner_exception: :class:`WrappedException <vsts.WrappedException>`
+    :type inner_exception: :class:`WrappedException <vsts.models.WrappedException>`
     :param message:
     :type message: str
     :param type_name:

vsts/vsts/vss_client.py

@@ -227,9 +227,14 @@ def _handle_error(self, request, response):
                     # Following code is to handle this unusual exception json case.
                     # TODO: dig into this.
                     collection_wrapper = self._base_deserialize('VssJsonCollectionWrapper', response)
-                    if collection_wrapper is not None:
+                    if collection_wrapper is not None and collection_wrapper.value is not None:
                         wrapped_exception = self._base_deserialize('ImproperException', collection_wrapper.value)
-                        raise VstsClientRequestError(wrapped_exception.message)
+                        if wrapped_exception is not None and wrapped_exception.message is not None:
+                            raise VstsClientRequestError(wrapped_exception.message)
+                # if we get here we still have not raised an exception, try to deserialize as a System Exception
+                system_exception = self._base_deserialize('SystemException', response)
+                if system_exception is not None and system_exception.message is not None:
+                    raise VstsClientRequestError(system_exception.message)
             except DeserializationError:
                 pass
         elif response.content is not None: