From 6af72207c7f144bdb1580ddf4ebacfc14aaf1d1e Mon Sep 17 00:00:00 2001
From: Sirushti Murugesan <sirushti.murugesan@hp.com>
Date: Mon, 13 Jul 2015 13:42:58 +0530
Subject: [PATCH] Make convergence functional

Change-Id: I64db5c15d53d5ffcb32a189b7239be08cad84406
---
 heat/engine/service.py            |  4 ----
 heat/tests/test_engine_service.py | 16 ++++++++--------
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/heat/engine/service.py b/heat/engine/service.py
index ff0601deb..7870910fe 100644
--- a/heat/engine/service.py
+++ b/heat/engine/service.py
@@ -636,9 +636,6 @@ class EngineService(service.Service):
         LOG.info(_LI('previewing stack %s'), stack_name)
 
         conv_eng = cfg.CONF.convergence_engine
-        if conv_eng:
-            raise exception.NotSupported(feature=_('Convergence engine'))
-
         stack = self._parse_template_and_validate_stack(cnxt,
                                                         stack_name,
                                                         template,
@@ -709,7 +706,6 @@ class EngineService(service.Service):
         stack.store()
         _create_stack_user(stack)
         if convergence:
-            raise exception.NotSupported(feature=_('Convergence engine'))
             action = stack.CREATE
             if stack.adopt_stack_data:
                 action = stack.ADOPT
diff --git a/heat/tests/test_engine_service.py b/heat/tests/test_engine_service.py
index 5a9a48607..1e2997144 100644
--- a/heat/tests/test_engine_service.py
+++ b/heat/tests/test_engine_service.py
@@ -1281,20 +1281,20 @@ class StackConvergenceServiceCreateUpdateTest(common.HeatTestCase):
                      parent_resource=None,
                      nested_depth=0, user_creds_id=None,
                      stack_user_project_id=None,
+                     timeout_mins=60,
+                     disable_rollback=False,
                      convergence=True).AndReturn(stack)
 
         self.m.StubOutWithMock(stack, 'validate')
         stack.validate().AndReturn(None)
 
         self.m.ReplayAll()
-
-        # TODO(later): Remove exception once convergence is supported.
-        ex = self.assertRaises(dispatcher.ExpectedException,
-                               self.man.create_stack, self.ctx, stack_name,
-                               template, params, None, {})
-        self.assertEqual(exception.NotSupported, ex.exc_info[0])
-        self.assertEqual('Convergence engine is not supported.',
-                         six.text_type(ex.exc_info[1]))
+        api_args = {'timeout_mins': 60, 'disable_rollback': False}
+        result = self.man.create_stack(self.ctx, 'service_create_test_stack',
+                                       template, params, None, api_args)
+        db_stack = stack_object.Stack.get_by_id(self.ctx, result['stack_id'])
+        self.assertEqual(db_stack.convergence, True)
+        self.assertEqual(result['stack_id'], db_stack.id)
         self.m.VerifyAll()
 
     def test_stack_create_enabled_convergence_engine(self):