Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix Action 'change_node_power_state' FAILED

Browse Source 
The return value of ironic_client.node.set_power_state is None, so it's
useless to return the result.
We should check the node state until it's changed or timeout.

Change-Id: I31f75a2c4a721ce4481e6ae7fb83d154a443dad9
Closes-Bug: #1713655
This commit is contained in:
licanwei
2017-08-29 03:26:23 -07:00
parent 0329dafec9
commit 6e6e5907ee
2 changed files with 41 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
watcher/tests/applier/actions/test_change_node_power_state.py
View File

@@ -90,7 +90,14 @@ class TestChangeNodePowerState(base.TestCase):
def test_execute_node_service_state_with_poweron_target(
self, mock_ironic, mock_nova):
mock_irclient = mock_ironic.return_value
self.action.execute()
self.action.input_parameters["state"] = (
change_node_power_state.NodeState.POWERON.value)
mock_irclient.node.get.side_effect = [
mock.MagicMock(power_state='power off'),
mock.MagicMock(power_state='power on')]
result = self.action.execute()
self.assertTrue(result)
mock_irclient.node.set_power_state.assert_called_once_with(
COMPUTE_NODE, change_node_power_state.NodeState.POWERON.value)
@@ -104,7 +111,12 @@ class TestChangeNodePowerState(base.TestCase):
mock_nvclient.hypervisors.get.return_value = mock_get
self.action.input_parameters["state"] = (
change_node_power_state.NodeState.POWEROFF.value)
self.action.execute()
mock_irclient.node.get.side_effect = [
mock.MagicMock(power_state='power on'),
mock.MagicMock(power_state='power on'),
mock.MagicMock(power_state='power off')]
result = self.action.execute()
self.assertTrue(result)
mock_irclient.node.set_power_state.assert_called_once_with(
COMPUTE_NODE, change_node_power_state.NodeState.POWEROFF.value)
@@ -118,6 +130,10 @@ class TestChangeNodePowerState(base.TestCase):
mock_nvclient.hypervisors.get.return_value = mock_get
self.action.input_parameters["state"] = (
change_node_power_state.NodeState.POWERON.value)
mock_irclient.node.get.side_effect = [
mock.MagicMock(power_state='power on'),
mock.MagicMock(power_state='power on'),
mock.MagicMock(power_state='power off')]
self.action.revert()
mock_irclient.node.set_power_state.assert_called_once_with(
@@ -128,6 +144,9 @@ class TestChangeNodePowerState(base.TestCase):
mock_irclient = mock_ironic.return_value
self.action.input_parameters["state"] = (
change_node_power_state.NodeState.POWEROFF.value)
mock_irclient.node.get.side_effect = [
mock.MagicMock(power_state='power off'),
mock.MagicMock(power_state='power on')]
self.action.revert()
mock_irclient.node.set_power_state.assert_called_once_with(