From 09fc0442ef0f74df697d9e7544b27eec068ddb39 Mon Sep 17 00:00:00 2001 From: huangtianhua Date: Wed, 11 Jan 2017 14:15:57 +0800 Subject: [PATCH] Allow to scale when group is in CHECK_COMPLETE When a signal of scaling policy arrive, we will find the group in stack by stack.resource_by_refid(), now we kick out the group if the it is in CHECK_COMPLETE. This change will correct this. Change-Id: I37308b85d2c8d53d24157320c7c25852f0f8d761 Closes-Bug:# 1655527 --- heat/engine/stack.py | 3 ++- heat/tests/test_stack.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/heat/engine/stack.py b/heat/engine/stack.py index 3af5354904..d26b8c86d8 100644 --- a/heat/engine/stack.py +++ b/heat/engine/stack.py @@ -756,7 +756,8 @@ class Stack(collections.Mapping): (r.RESUME, r.IN_PROGRESS), (r.RESUME, r.COMPLETE), (r.UPDATE, r.IN_PROGRESS), - (r.UPDATE, r.COMPLETE)) and + (r.UPDATE, r.COMPLETE), + (r.CHECK, r.COMPLETE)) and (r.FnGetRefId() == refid or r.name == refid)): return r diff --git a/heat/tests/test_stack.py b/heat/tests/test_stack.py index 7450358417..8fa40e0639 100644 --- a/heat/tests/test_stack.py +++ b/heat/tests/test_stack.py @@ -1075,7 +1075,8 @@ class StackTest(common.HeatTestCase): (rsrc.RESUME, rsrc.IN_PROGRESS), (rsrc.RESUME, rsrc.COMPLETE), (rsrc.UPDATE, rsrc.IN_PROGRESS), - (rsrc.UPDATE, rsrc.COMPLETE)): + (rsrc.UPDATE, rsrc.COMPLETE), + (rsrc.CHECK, rsrc.COMPLETE)): rsrc.state_set(action, status) self.assertEqual(rsrc, self.stack.resource_by_refid('aaaa'))