From 3f08a0ce7efb0e50578cf8c0449f630c2586f8f8 Mon Sep 17 00:00:00 2001
From: Josh Gachnang <josh@pcsforeducation.com>
Date: Tue, 18 Mar 2014 10:39:47 -0700
Subject: [PATCH] Renaming ConfigurationError to LookupNodeError

---
 teeth_agent/errors.py                   | 8 +++++---
 teeth_agent/overlord_agent_api.py       | 8 ++++----
 teeth_agent/tests/overlord_agent_api.py | 6 +++---
 3 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/teeth_agent/errors.py b/teeth_agent/errors.py
index b9a856831..6ba45316c 100644
--- a/teeth_agent/errors.py
+++ b/teeth_agent/errors.py
@@ -110,13 +110,15 @@ class HeartbeatError(OverlordAPIError):
         super(HeartbeatError, self).__init__(details)
 
 
-class ConfigurationError(OverlordAPIError):
-    """Error raised when the configuration lookup to the agent API fails."""
+class LookupNodeError(OverlordAPIError):
+    """Error raised when the node configuration lookup to the Ironic API
+    fails.
+    """
 
     message = 'Error getting configuration from Ironic.'
 
     def __init__(self, details):
-        super(ConfigurationError, self).__init__(details)
+        super(LookupNodeError, self).__init__(details)
 
 
 class ImageDownloadError(RESTError):
diff --git a/teeth_agent/overlord_agent_api.py b/teeth_agent/overlord_agent_api.py
index ff37c2f8d..c66a78b3a 100644
--- a/teeth_agent/overlord_agent_api.py
+++ b/teeth_agent/overlord_agent_api.py
@@ -84,20 +84,20 @@ class APIClient(object):
         try:
             response = self._request('POST', path, data=data)
         except Exception as e:
-            raise errors.ConfigurationError(str(e))
+            raise errors.LookupNodeError(str(e))
 
         if response.status_code != requests.codes.OK:
             msg = 'Invalid status code: {0}'.format(response.status_code)
-            raise errors.ConfigurationError(msg)
+            raise errors.LookupNodeError(msg)
 
         try:
             content = json.loads(response.content)
         except Exception as e:
-            raise errors.ConfigurationError('Error decoding response: '
+            raise errors.LookupNodeError('Error decoding response: '
                                             + str(e))
 
         if 'node' not in content or 'uuid' not in content['node']:
-            raise errors.ConfigurationError('Got invalid data from the API: '
+            raise errors.LookupNodeError('Got invalid data from the API: '
                                             '{0}'.format(content))
         return content
 
diff --git a/teeth_agent/tests/overlord_agent_api.py b/teeth_agent/tests/overlord_agent_api.py
index 57cdf7d81..0227c7ee6 100644
--- a/teeth_agent/tests/overlord_agent_api.py
+++ b/teeth_agent/tests/overlord_agent_api.py
@@ -140,7 +140,7 @@ class TestBaseTeethAgent(unittest.TestCase):
         self.api_client.session.request = mock.Mock()
         self.api_client.session.request.return_value = response
 
-        self.assertRaises(errors.ConfigurationError,
+        self.assertRaises(errors.LookupNodeError,
                           self.api_client.lookup_node,
                           mac_addrs=['aa:bb:cc:dd:ee:ff',
                                       '42:42:42:42:42:42'],
@@ -156,7 +156,7 @@ class TestBaseTeethAgent(unittest.TestCase):
         self.api_client.session.request = mock.Mock()
         self.api_client.session.request.return_value = response
 
-        self.assertRaises(errors.ConfigurationError,
+        self.assertRaises(errors.LookupNodeError,
                           self.api_client.lookup_node,
                           mac_addrs=['aa:bb:cc:dd:ee:ff',
                                       '42:42:42:42:42:42'],
@@ -174,7 +174,7 @@ class TestBaseTeethAgent(unittest.TestCase):
         self.api_client.session.request = mock.Mock()
         self.api_client.session.request.return_value = response
 
-        self.assertRaises(errors.ConfigurationError,
+        self.assertRaises(errors.LookupNodeError,
                           self.api_client.lookup_node,
                           mac_addrs=['aa:bb:cc:dd:ee:ff',
                                       '42:42:42:42:42:42'],