summaryrefslogtreecommitdiff
path: root/ironic_python_agent/tests
diff options
context:
space:
mode:
authorJulia Kreger <juliaashleykreger@gmail.com>2020-07-30 16:16:57 -0700
committerJulia Kreger <juliaashleykreger@gmail.com>2020-08-07 22:29:49 +0000
commit0153622c289e0af4d5895098468d1b1c118fb8bf (patch)
tree2ced4316932f820f9d323c5542639cc33d358dfe /ironic_python_agent/tests
parente11e98d072b47d427f196966166f4552d402c830 (diff)
downloadironic-python-agent-0153622c289e0af4d5895098468d1b1c118fb8bf.tar.gz
Fix TypeError on agent lookup failure
Agent lookups can fail as we presently use logging.exception, better known in our code as LOG.exception, which can also generate other fun issues on journald based systems where additional errors could be raised resulting in us being unable to troubleshoot the the actual issue. Because of the mis-use of LOG.exception and the default behavior of the backoff retry handler, the retry logic was also not functional as any error no matter how small caused IPA to just exit. Change-Id: Ic4608b7c6ff9773d1403926efb3d59869c71343b Story: 2007968 Task: 40465 (cherry picked from commit 5eab9bced63b2b9a6753cbbf594dda7ef9d03a3a)
Diffstat (limited to 'ironic_python_agent/tests')
-rw-r--r--ironic_python_agent/tests/unit/test_ironic_api_client.py42
1 files changed, 42 insertions, 0 deletions
diff --git a/ironic_python_agent/tests/unit/test_ironic_api_client.py b/ironic_python_agent/tests/unit/test_ironic_api_client.py
index c0f8bb74..63e100ff 100644
--- a/ironic_python_agent/tests/unit/test_ironic_api_client.py
+++ b/ironic_python_agent/tests/unit/test_ironic_api_client.py
@@ -16,6 +16,7 @@ from unittest import mock
from oslo_serialization import jsonutils
from oslo_service import loopingcall
+import requests
from ironic_python_agent import errors
from ironic_python_agent import hardware
@@ -312,6 +313,47 @@ class TestBaseIronicPythonAgent(base.IronicAgentTest):
'node_uuid': 'someuuid'},
params)
+ @mock.patch.object(ironic_api_client, 'LOG', autospec=True)
+ def test_do_lookup_transient_exceptions(self, mock_log):
+ exc_list = [requests.exceptions.ConnectionError,
+ requests.exceptions.ReadTimeout,
+ requests.exceptions.HTTPError,
+ requests.exceptions.Timeout,
+ requests.exceptions.ConnectTimeout]
+ self.api_client.session.request = mock.Mock()
+ for exc in exc_list:
+ self.api_client.session.request.reset_mock()
+ mock_log.reset_mock()
+ self.api_client.session.request.side_effect = exc
+ error = self.api_client._do_lookup(self.hardware_info,
+ node_uuid=None)
+ self.assertFalse(error)
+ mock_log.error.assert_has_calls([])
+ self.assertEqual(1, mock_log.warning.call_count)
+
+ @mock.patch.object(ironic_api_client, 'LOG', autospec=True)
+ def test_do_lookup_unknown_exception(self, mock_log):
+ self.api_client.session.request = mock.Mock()
+ self.api_client.session.request.side_effect = \
+ requests.exceptions.RequestException('meow')
+ self.assertFalse(
+ self.api_client._do_lookup(self.hardware_info,
+ node_uuid=None))
+ self.assertEqual(1, mock_log.exception.call_count)
+
+ @mock.patch.object(ironic_api_client, 'LOG', autospec=True)
+ def test_do_lookup_unknown_exception_fallback(self, mock_log):
+ mock_log.exception.side_effect = TypeError
+ self.api_client.session.request = mock.Mock()
+ self.api_client.session.request.side_effect = \
+ requests.exceptions.RequestException('meow')
+ self.assertRaises(errors.LookupNodeError,
+ self.api_client._do_lookup,
+ self.hardware_info,
+ node_uuid=None)
+ self.assertEqual(1, mock_log.exception.call_count)
+ self.assertEqual(2, mock_log.error.call_count)
+
def test_do_lookup_bad_response_code(self):
response = FakeResponse(status_code=400, content={
'node': {