checkE2ESvcInstStatus using status_result

Change-Id: Idaa55084f5ecb0dd3636c232cebc14fa5f0641f8
Issue-ID: SO-419
Signed-off-by: Yulian Han <elaine.hanyulian@huawei.com>

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java
index 2e0b53d..5016c9d 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstances.java
@@ -687,7 +687,7 @@ public class E2EServiceInstances {
                        return response;\r
                }\r
 \r
-               if (curStatus != null && !curStatus.getProgress().equals("100")) {\r
+               if (curStatus != null && curStatus.getResult() != null && curStatus.getResult().equalsIgnoreCase("processing")) {\r
                        String chkMessage = "Error: Locked instance - This " + requestScope + " (" + requestId + ") "\r
                                        + "now being worked with a status of " + curStatus.getProgress() + " (ServiceName - "\r
                                        + curStatus.getServiceName()\r

diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstancesTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstancesTest.java
index 590ac7c..c0f6ccc 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstancesTest.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/openecomp/mso/apihandlerinfra/E2EServiceInstancesTest.java
@@ -719,6 +719,7 @@ public class E2EServiceInstancesTest {
                                        String serviceID) {\r
                                OperationStatus operationStatus = new OperationStatus();\r
                                operationStatus.setProgress("100");\r
+                               operationStatus.setResult("finish");\r
                                return operationStatus;\r
                        }\r
                };\r
@@ -790,6 +791,7 @@ public class E2EServiceInstancesTest {
                        public OperationStatus getOperationStatusByServiceId(\r
                                        String serviceID) {\r
                                OperationStatus operationStatus = new OperationStatus();\r
+                               operationStatus.setResult("processing");\r
                                return operationStatus;\r
                        }\r
                };\r