Merge lp:~julian-edwards/pyjuju/show-errors-when-acquiring-node into lp:pyjuju

[Julian Edwards]

Show error text returned from maas if it has an error bootstrapping.

Fix a problem in the maas provider where it was not showing the text returned when there was an error acquiring a node during bootstrap. Where it was just saying "CONFLICT" it now says "No matching node is available" which is the text returned from maas.

[William Reade (fwereade)]

LGTM

review: Approve

[Kapil Thangavelu (hazmat)]

lgtm

review: Approve

=== modified file 'juju/providers/maas/maas.py'
--- juju/providers/maas/maas.py	2012-03-28 14:40:14 +0000
+++ juju/providers/maas/maas.py	2012-05-25 06:54:17 +0000
@@ -6,6 +6,8 @@
 from base64 import b64encode
 import json
 import re
+from twisted.python.failure import Failure
+from twisted.web.error import Error
 from urllib import urlencode
 from urlparse import urljoin
 
@@ -55,6 +57,19 @@
         self.admin_secret = config["admin-secret"]
         super(MAASClient, self).__init__(self.oauth_info)
 
+    def _process_error(self, failure):
+        if isinstance(failure, Failure):
+            error = failure.value
+        else:
+            error = failure
+
+        # Catch twisted.web.error.Error here as we need to present the
+        # error text that it comes with.
+        if isinstance(error, Error):
+            raise ProviderError(error.response)
+        
+        return convert_unknown_error(failure)
+
     def get(self, path, params):
         """Dispatch a C{GET} call to a MAAS server.
 
@@ -66,7 +81,7 @@
         url = "%s?%s" % (urljoin(self.url, path), urlencode(params))
         d = self.dispatch_query(url)
         d.addCallback(json.loads)
-        d.addErrback(convert_unknown_error)
+        d.addErrback(self._process_error)
         return d
 
     def post(self, path, params):
@@ -80,7 +95,7 @@
         body, headers = encode_multipart_data(params, {})
         d = self.dispatch_query(url, "POST", headers=headers, data=body)
         d.addCallback(json.loads)
-        d.addErrback(convert_unknown_error)
+        d.addErrback(self._process_error)
         return d
 
     def get_nodes(self, resource_uris=None):

=== modified file 'juju/providers/maas/tests/test_launch.py'
--- juju/providers/maas/tests/test_launch.py	2012-03-28 14:40:14 +0000
+++ juju/providers/maas/tests/test_launch.py	2012-05-25 06:54:17 +0000
@@ -6,7 +6,7 @@
 from StringIO import StringIO
 from twisted.internet import defer
 from twisted.internet.defer import inlineCallbacks
-from xmlrpclib import Fault
+from twisted.web.error import Error
 
 from juju.errors import ProviderError
 from juju.lib.mocker import ANY
@@ -78,12 +78,10 @@
         # These arbitrary fake failure values come from
         # FakeMAASHTTPConnectionWithNoAvailableNodes.acquire_node()
         def check_failure_values(failure):
-            code = failure.faultCode
-            text = failure.faultString
-            self.assertEqual(1, code)
-            self.assertEqual("No available nodes", text)
+            text = failure.message
+            self.assertEqual("No matching node is available.", text)
 
-        return self.assertFailure(d, Fault).addBoth(check_failure_values)
+        return self.assertFailure(d, ProviderError).addBoth(check_failure_values)
 
     @inlineCallbacks
     def test_actually_launch(self):

=== modified file 'juju/providers/maas/tests/test_maas.py'
--- juju/providers/maas/tests/test_maas.py	2012-03-28 14:40:14 +0000
+++ juju/providers/maas/tests/test_maas.py	2012-05-25 06:54:17 +0000
@@ -11,7 +11,8 @@
 from juju.errors import ProviderError
 from juju.providers.maas.maas import extract_system_id, MAASClient
 from juju.providers.maas.tests.testing import (
-    CONFIG, FakeMAASHTTPConnection, NODE_JSON, TestCase)
+    CONFIG, FakeMAASHTTPConnection,
+    FakeMAASHTTPConnectionWithNoAvailableNodes, NODE_JSON, TestCase)
 
 
 class TestFunctions(TestCase):
@@ -211,6 +212,14 @@
         self.assertIn("Authorization", factory_call.result.headers)
 
     @inlineCallbacks
+    def test_acquire_node_raises_correct_exception_when_CONFLICT_happens(self):
+        log = self.setup_connection(
+            MAASClient, FakeMAASHTTPConnectionWithNoAvailableNodes)
+        client = MAASClient(CONFIG)
+        e = yield self.assertFailure(client.acquire_node(), ProviderError)
+        self.assertEqual("No matching node is available.", str(e))
+
+    @inlineCallbacks
     def test_start_node(self):
         resource_uri = NODE_JSON[0]["resource_uri"]
         data = "This is test data."

=== modified file 'juju/providers/maas/tests/testing.py'
--- juju/providers/maas/tests/testing.py	2012-03-28 14:40:14 +0000
+++ juju/providers/maas/tests/testing.py	2012-05-25 06:54:17 +0000
@@ -6,7 +6,7 @@
 from collections import namedtuple
 import json
 from twisted.internet import defer
-from xmlrpclib import Fault
+from twisted.web.error import Error
 
 from juju.lib import testing
 from juju.providers.maas.auth import DEFAULT_FACTORY, MAASOAuthConnection
@@ -167,4 +167,4 @@
     are available."""
 
     def acquire_node(self):
-        raise Fault(1, "No available nodes")
+        return defer.fail(Error(409, "CONFLICT", "No matching node is available."))