fix for including the operation ID in response

IssueId: SO-226

Change-Id: Ifd515c16b876cc006703a9ae87e5daaff0b34a14
Signed-off-by: Seshu-Kumar-M <seshu.kumar.m@huawei.com>

diff --git a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy
index 7f4f787..2fda530 100644 (file)
--- a/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy
+++ b/bpmn/MSOInfrastructureBPMN/src/main/groovy/org/openecomp/mso/bpmn/infrastructure/scripts/CreateCustomE2EServiceInstance.groovy
@@ -160,10 +160,10 @@ public class CreateCustomE2EServiceInstance extends AbstractServiceTaskProcessor
                utils.log("DEBUG", " *** sendSyncResponse *** ", isDebugEnabled)
 
                try {
-                       String requestId = execution.getVariable("msoRequestId")
+                       String operationId = execution.getVariable("operationId")
                        String serviceInstanceId = execution.getVariable("serviceInstanceId")
                        // RESTResponse for API Handler (APIH) Reply Task
-                       String createServiceRestRequest = """{"service":{"serviceId":"${serviceInstanceId}","operationId":"${requestId}"}}""".trim()
+                       String createServiceRestRequest = """{"service":{"serviceId":"${serviceInstanceId}","operationId":"${operationId}"}}""".trim()
                        utils.log("DEBUG", " sendSyncResponse to APIH:" + "\n" + createServiceRestRequest, isDebugEnabled)
                        sendWorkflowResponse(execution, 202, createServiceRestRequest)
                        execution.setVariable("sentSyncResponse", true)

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/OrchestrationRequests.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/OrchestrationRequests.java
index fb507a6..92a45a7 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/OrchestrationRequests.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/OrchestrationRequests.java
@@ -54,6 +54,7 @@ import org.openecomp.mso.logger.MessageEnum;
 import org.openecomp.mso.logger.MsoAlarmLogger;
 import org.openecomp.mso.logger.MsoLogger;
 import org.openecomp.mso.requestsdb.InfraActiveRequests;
+import org.openecomp.mso.requestsdb.OperationStatus;
 import org.openecomp.mso.requestsdb.RequestsDatabase;
 
 import com.wordnik.swagger.annotations.Api;
@@ -146,10 +147,10 @@ public class OrchestrationRequests {
 
                long startTime = System.currentTimeMillis();
 
-               InfraActiveRequests requestDB = null;
+               OperationStatus requestDB = null;
 
                try {
-                       requestDB = requestsDB.getRequestFromInfraActive(serviceId);
+                       requestDB = requestsDB.getOperationStatus(serviceId, operationId);
 
                } catch (Exception e) {
                        msoLogger.error(MessageEnum.APIH_DB_ACCESS_EXC, MSO_PROP_APIHANDLER_INFRA, "", "",
@@ -181,9 +182,7 @@ public class OrchestrationRequests {
 
                }
 
-               E2ERequest e2erequest = mapInfraActiveRequestToE2ERequest(requestDB);
-
-               e2eServiceResponse.setE2eRequest(e2erequest);
+               e2eServiceResponse.setE2eRequest(requestDB);
 
                return Response.status(200).entity(e2eServiceResponse).build();
        }

diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/GetE2EServiceInstanceResponse.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/GetE2EServiceInstanceResponse.java
index 8145afc..4c749b7 100644 (file)
--- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/GetE2EServiceInstanceResponse.java
+++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra/e2eserviceinstancebeans/GetE2EServiceInstanceResponse.java
@@ -22,18 +22,19 @@
 package org.openecomp.mso.apihandlerinfra.e2eserviceinstancebeans;\r
 \r
 import org.codehaus.jackson.map.annotate.JsonSerialize;\r
+import org.openecomp.mso.requestsdb.OperationStatus;\r
 \r
 @JsonSerialize(include=JsonSerialize.Inclusion.NON_DEFAULT)\r
 public class GetE2EServiceInstanceResponse {\r
 \r
-       protected E2ERequest e2eRequest;\r
+       protected OperationStatus e2eRequest;\r
 \r
-       public E2ERequest getE2eRequest() {\r
+       public OperationStatus getE2eRequest() {\r
                return e2eRequest;\r
        }\r
 \r
-       public void setE2eRequest(E2ERequest e2eRequest) {\r
-               this.e2eRequest = e2eRequest;\r
+       public void setE2eRequest(OperationStatus requestDB) {\r
+               this.e2eRequest = requestDB;\r
        }\r
 \r
 }\r