commit b40d7b32ef67b912e9dd54080eaba80e58001ab1
author Chuanyu Chen <chenchuanyu@huawei.com> Wed May 23 01:23:00 2018 +0000
committer Gerrit Code Review <gerrit@onap.org> Wed May 23 01:23:00 2018 +0000
tree c3b70411b7d1602c12f1d7ec5d788a3cff2151f7
parent a4558a93093d71c55300a8c85a4a2cdc09814f5c
parent fdc81a361037ee764f3e999a7cb03f602083641c

Merge "fix endless loop"

bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoScaleVFCNetworkServiceInstance.groovy

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoScaleVFCNetworkServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoScaleVFCNetworkServiceInstance.groovy
index 9e3f78b..0e4aea0 100644
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoScaleVFCNetworkServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/DoScaleVFCNetworkServiceInstance.groovy
@@ -123,7 +123,7 @@
             String isScaleFinished = ""
 
             // query the requested network service scale status, if finished, then start the next one, otherwise, wait
-            while (isScaleFinished != "finished"){
+            while (isScaleFinished != "finished" && isScaleFinished != "error"){
                 timeDelay()
                 queryNSProgress(execution)
                 isScaleFinished = execution.getVariable("operationStatus")