From a4658ef9ee2879137b202bf66b2ac1a3fe7b7670 Mon Sep 17 00:00:00 2001 From: Seshu-Kumar-M Date: Tue, 17 Oct 2017 15:27:14 +0530 Subject: fix for including the operation ID in response IssueId: SO-226 Change-Id: Ifd515c16b876cc006703a9ae87e5daaff0b34a14 Signed-off-by: Seshu-Kumar-M --- .../org/openecomp/mso/apihandlerinfra/OrchestrationRequests.java | 9 ++++----- .../e2eserviceinstancebeans/GetE2EServiceInstanceResponse.java | 9 +++++---- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'mso-api-handlers/mso-api-handler-infra/src/main/java/org/openecomp/mso/apihandlerinfra') 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 fb507a69cf..92a45a71dd 100644 --- 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 8145afca6d..4c749b7e58 100644 --- 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; import org.codehaus.jackson.map.annotate.JsonSerialize; +import org.openecomp.mso.requestsdb.OperationStatus; @JsonSerialize(include=JsonSerialize.Inclusion.NON_DEFAULT) public class GetE2EServiceInstanceResponse { - protected E2ERequest e2eRequest; + protected OperationStatus e2eRequest; - public E2ERequest getE2eRequest() { + public OperationStatus getE2eRequest() { return e2eRequest; } - public void setE2eRequest(E2ERequest e2eRequest) { - this.e2eRequest = e2eRequest; + public void setE2eRequest(OperationStatus requestDB) { + this.e2eRequest = requestDB; } } -- cgit 1.2.3-korg