Merge "Use heat.engine.resource.UpdateReplace"

heat/engine/resource.py

@@ -1162,7 +1162,7 @@ class Resource(object):
             try:
                 runner(timeout=timeout, progress_callback=progress_callback)
                 update_tmpl_id_and_requires()
-            except exception.UpdateReplace:
+            except UpdateReplace:
                 raise
             except BaseException:
                 with excutils.save_and_reraise_exception():

heat/tests/test_resource.py

@@ -2025,7 +2025,7 @@ class ResourceTest(common.HeatTestCase):
                                  new_temp, stack_id=self.stack.id)
 
         res_data = {}
-        self.assertRaises(exception.UpdateReplace, res.update_convergence,
+        self.assertRaises(resource.UpdateReplace, res.update_convergence,
                           new_temp.id, res_data, 'engine-007',
                           -1, new_stack)