openstack
/
heat
Code Issues Proposed changes

Merge "Fix resouce group resource removal policy name inconsistency with DB"

This commit is contained in:
Jenkins 2016-08-14 04:51:14 +00:00 committed by Gerrit Code Review
parent a2f5b5cb9a 6c2e0c9486
commit 20a570018c
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat/engine/resources/openstack/heat/resource_group.py
View File

@ -297,7 +297,7 @@ class ResourceGroup(stack_resource.StackResource):
raise exception.StackValidationFailed(message=msg)
def _current_blacklist(self):
db_rsrc_names = self.data().get(self.REMOVED_RSRC_LIST)
db_rsrc_names = self.data().get('name_blacklist')
if db_rsrc_names:
return db_rsrc_names.split(',')
else:
@ -578,6 +578,10 @@ class ResourceGroup(stack_resource.StackResource):
policy[self.MAX_BATCH_SIZE],
policy[self.PAUSE_TIME])
def _resolve_attribute(self, name):
if name == self.REMOVED_RSRC_LIST:
return self._current_blacklist()
def _update_timeout(self, batch_cnt, pause_sec):
total_pause_time = pause_sec * max(batch_cnt - 1, 0)
if total_pause_time >= self.stack.timeout_secs():

2
heat/tests/openstack/heat/test_resource_group.py
View File

@ -833,7 +833,7 @@ class ResourceGroupAttrTest(common.HeatTestCase):
def test_get_attribute_blacklist(self):
resg = self._create_dummy_stack()
resg.data = mock.Mock(return_value={resg.REMOVED_RSRC_LIST: '3,5'})
resg.data = mock.Mock(return_value={'name_blacklist': '3,5'})
expected = ['3', '5']
self.assertEqual(expected, resg.FnGetAtt(resg.REMOVED_RSRC_LIST))