commit 5dd1207b97d2a2d4614ecfc55d75fad08b0999d9
author Tomáš Kukrál <tkukral@mirantis.com> Tue Jun 13 15:54:44 2017 +0200
committer Tomáš Kukrál <tkukral@mirantis.com> Tue Jun 13 16:03:20 2017 +0200
tree 19902a379714dc31d5d329fd7ad2f31d83a37965
parent c6cb4ff35cbf0d606312a0507b8e1e4f0f813b72

update check in waitForAutoscalingInstances

Change-Id: I83dc3001b09ce68596634190835f119e1acde443

src/com/mirantis/mk/Aws.groovy

diff --git a/src/com/mirantis/mk/Aws.groovy b/src/com/mirantis/mk/Aws.groovy
index acc33d7..106de4c 100644
--- a/src/com/mirantis/mk/Aws.groovy
+++ b/src/com/mirantis/mk/Aws.groovy
@@ -180,7 +180,7 @@
                 def instances = out['Instances']
 
                 // check all instances are InService
-                if (common.countHashMapEquals(instances, 'LifecycleState', 'InService') == 0) {
+                if (common.countHashMapEquals(instances, 'LifecycleState', 'InService') == out['DesiredCapacity']) {
                     break
                 }
 

src/com/mirantis/mk/Common.groovy

diff --git a/src/com/mirantis/mk/Common.groovy b/src/com/mirantis/mk/Common.groovy
index 0597cfa..ee6559e 100644
--- a/src/com/mirantis/mk/Common.groovy
+++ b/src/com/mirantis/mk/Common.groovy
@@ -449,5 +449,5 @@
 
 @NonCPS
 def countHashMapEquals(lm, param, eq) {
-    return lm.stream().filter{i -> !i[param].equals(eq)}.collect(java.util.stream.Collectors.counting())
+    return lm.stream().filter{i -> i[param].equals(eq)}.collect(java.util.stream.Collectors.counting())
 }