Merge "Raise NotFoundException for 404s"

openstack/exceptions.py

@@ -75,6 +75,11 @@ class HttpException(SDKException):
         return self.__unicode__()
 
 
+class NotFoundException(HttpException):
+    """HTTP 404 Not Found."""
+    pass
+
+
 class MethodNotSupported(SDKException):
     """The resource does not support this operation type."""
     pass

openstack/tests/test_transport.py

@@ -305,7 +305,7 @@ class TestTransport(base.TestTransportBase):
 
         mock_req.get(self.TEST_URL, status_code=status)
 
-        exc = self.assertRaises(exceptions.HttpException, xport.get,
+        exc = self.assertRaises(exceptions.NotFoundException, xport.get,
                                 self.TEST_URL)
         self.assertEqual(status, exc.status_code)
 

openstack/transport.py

@@ -262,10 +262,15 @@ class Transport(requests.Session):
         try:
             resp.raise_for_status()
         except requests.RequestException as e:
-            raise exceptions.HttpException(
+            if resp.status_code == 404:
-                six.text_type(e),
+                exc_type = exceptions.NotFoundException
-                details=self._parse_error_response(resp),
+            else:
-                status_code=resp.status_code)
+                exc_type = exceptions.HttpException
+
+            raise exc_type(six.text_type(e),
+                           details=self._parse_error_response(resp),
+                           status_code=resp.status_code)
+
         if accept == JSON:
             try:
                 resp.body = resp.json()