diff options
Diffstat (limited to 'ironic')
| -rw-r--r-- | ironic/drivers/modules/agent_client.py | 2 | ||||
| -rw-r--r-- | ironic/tests/unit/drivers/modules/test_agent_client.py | 10 |
2 files changed, 11 insertions, 1 deletions
diff --git a/ironic/drivers/modules/agent_client.py b/ironic/drivers/modules/agent_client.py index 545a6aea4..0e3fcb57b 100644 --- a/ironic/drivers/modules/agent_client.py +++ b/ironic/drivers/modules/agent_client.py @@ -162,7 +162,7 @@ class AgentClient(object): """ url = self._get_command_url(node) LOG.debug('Fetching status of agent commands for node %s', node.uuid) - resp = self.session.get(url) + resp = self.session.get(url, timeout=CONF.agent.command_timeout) result = resp.json()['commands'] status = '; '.join('%(cmd)s: result "%(res)s", error "%(err)s"' % {'cmd': r.get('command_name'), diff --git a/ironic/tests/unit/drivers/modules/test_agent_client.py b/ironic/tests/unit/drivers/modules/test_agent_client.py index 1c563f7fd..4a5d6f89f 100644 --- a/ironic/tests/unit/drivers/modules/test_agent_client.py +++ b/ironic/tests/unit/drivers/modules/test_agent_client.py @@ -21,10 +21,14 @@ import six from six.moves import http_client from ironic.common import exception +from ironic import conf from ironic.drivers.modules import agent_client from ironic.tests import base +CONF = conf.CONF + + class MockResponse(object): def __init__(self, text, status_code=http_client.OK): assert isinstance(text, six.string_types) @@ -181,6 +185,12 @@ class TestAgentClient(base.TestCase): res.json.return_value = {'commands': []} mock_get.return_value = res self.assertEqual([], self.client.get_commands_status(self.node)) + agent_url = self.node.driver_internal_info.get('agent_url') + mock_get.assert_called_once_with( + '%(agent_url)s/%(api_version)s/commands' % { + 'agent_url': agent_url, + 'api_version': CONF.agent.agent_api_version}, + timeout=CONF.agent.command_timeout) def test_prepare_image(self): self.client._command = mock.MagicMock(spec_set=[]) |