openstack/deb-heat
Code Issues Proposed changes

Merge "Make convergence functional"

Browse Source
This commit is contained in:
Jenkins 2015-08-03 06:04:24 +00:00 committed by Gerrit Code Review
commit 36f0379fa5
2 changed files with 8 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
heat/engine/service.py
View File

@ -637,9 +637,6 @@ class EngineService(service.Service):
LOG.info(_LI('previewing stack %s'), stack_name) LOG.info(_LI('previewing stack %s'), stack_name)
conv_eng = cfg.CONF.convergence_engine conv_eng = cfg.CONF.convergence_engine
if conv_eng:
raise exception.NotSupported(feature=_('Convergence engine'))
stack = self._parse_template_and_validate_stack(cnxt, stack = self._parse_template_and_validate_stack(cnxt,
stack_name, stack_name,
template, template,
@ -710,7 +707,6 @@ class EngineService(service.Service):
stack.store() stack.store()
_create_stack_user(stack) _create_stack_user(stack)
if convergence: if convergence:
raise exception.NotSupported(feature=_('Convergence engine'))
action = stack.CREATE action = stack.CREATE
if stack.adopt_stack_data: if stack.adopt_stack_data:
action = stack.ADOPT action = stack.ADOPT

16
heat/tests/test_engine_service.py
View File

@ -1386,20 +1386,20 @@ class StackConvergenceServiceCreateUpdateTest(common.HeatTestCase):
parent_resource=None, parent_resource=None,
nested_depth=0, user_creds_id=None, nested_depth=0, user_creds_id=None,
stack_user_project_id=None, stack_user_project_id=None,
timeout_mins=60,
disable_rollback=False,
convergence=True).AndReturn(stack) convergence=True).AndReturn(stack)
self.m.StubOutWithMock(stack, 'validate') self.m.StubOutWithMock(stack, 'validate')
stack.validate().AndReturn(None) stack.validate().AndReturn(None)
self.m.ReplayAll() self.m.ReplayAll()
api_args = {'timeout_mins': 60, 'disable_rollback': False}
# TODO(later): Remove exception once convergence is supported. result = self.man.create_stack(self.ctx, 'service_create_test_stack',
ex = self.assertRaises(dispatcher.ExpectedException, template, params, None, api_args)
self.man.create_stack, self.ctx, stack_name, db_stack = stack_object.Stack.get_by_id(self.ctx, result['stack_id'])
template, params, None, {}) self.assertEqual(db_stack.convergence, True)
self.assertEqual(exception.NotSupported, ex.exc_info[0]) self.assertEqual(result['stack_id'], db_stack.id)
self.assertEqual('Convergence engine is not supported.',
six.text_type(ex.exc_info[1]))
self.m.VerifyAll() self.m.VerifyAll()
def test_stack_create_enabled_convergence_engine(self): def test_stack_create_enabled_convergence_engine(self):