From: Yulian Han <elaine.hanyulian@huawei.com>
Date: Wed, 28 Mar 2018 09:04:00 +0000 (+0800)
Subject: checkE2ESvcInstStatus using status_result
X-Git-Tag: v1.2.1~280^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=52a0b13a8c8bba2e1e2b4d36a6b7548d6fc79f29;p=so.git

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 2e0b53d5d8..5016c9d3e7 100644
--- 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;
 		}
 
-		if (curStatus != null && !curStatus.getProgress().equals("100")) {
+		if (curStatus != null && curStatus.getResult() != null && curStatus.getResult().equalsIgnoreCase("processing")) {
 			String chkMessage = "Error: Locked instance - This " + requestScope + " (" + requestId + ") "
 					+ "now being worked with a status of " + curStatus.getProgress() + " (ServiceName - "
 					+ curStatus.getServiceName()
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 590ac7cbed..c0f6ccc730 100644
--- 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) {
 				OperationStatus operationStatus = new OperationStatus();
 				operationStatus.setProgress("100");
+				operationStatus.setResult("finish");
 				return operationStatus;
 			}
 		};
@@ -790,6 +791,7 @@ public class E2EServiceInstancesTest {
 			public OperationStatus getOperationStatusByServiceId(
 					String serviceID) {
 				OperationStatus operationStatus = new OperationStatus();
+				operationStatus.setResult("processing");
 				return operationStatus;
 			}
 		};