openstack
/
senlin
Code Issues Proposed changes

Fix cluster action operation always use default_action_timeout value 

Change-Id: Id3438c470db11886e855a54e4cbe93e3727d9f3b
Closes-Bug: #1707607
This commit is contained in:
Yuanbin.Chen 2017-08-18 22:44:20 +08:00 committed by tengqm
parent 3108aff185
commit c3ae0c82bc
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
senlin/engine/actions/cluster_action.py
View File

@ -51,6 +51,7 @@ class ClusterAction(base.Action):
try:
self.entity = cluster_mod.Cluster.load(self.context, self.target)
self.timeout = self.entity.timeout
except Exception:
self.entity = None

15
senlin/tests/unit/engine/actions/test_action_base.py
View File

@ -94,12 +94,17 @@ class ActionBaseTest(base.SenlinTestCase):
self.assertIsNone(obj.updated_at)
self.assertEqual({}, obj.data)
@mock.patch.object(node_mod.Node, 'load')
@mock.patch.object(cluster_mod.Cluster, 'load')
def test_action_new(self, mock_n_load, mock_c_load):
for action in ['CLUSTER_CREATE', 'NODE_CREATE', 'WHAT_EVER']:
obj = ab.Action(OBJID, action, self.ctx)
self._verify_new_action(obj, OBJID, action)
def test_action_new_cluster(self, mock_load):
fake_cluster = mock.Mock(timeout=cfg.CONF.default_action_timeout)
mock_load.return_value = fake_cluster
obj = ab.Action(OBJID, 'CLUSTER_CREATE', self.ctx)
self._verify_new_action(obj, OBJID, 'CLUSTER_CREATE')
@mock.patch.object(node_mod.Node, 'load')
def test_action_new_node(self, mock_load):
obj = ab.Action(OBJID, 'NODE_CREATE', self.ctx)
self._verify_new_action(obj, OBJID, 'NODE_CREATE')
def test_action_init_with_values(self):
values = copy.deepcopy(self.action_values)