diff options
Diffstat (limited to 'mso-api-handlers/mso-api-handler-infra/src')
6 files changed, 37 insertions, 17 deletions
diff --git a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java index 0c0b70b6dd..9c280cb70f 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java +++ b/mso-api-handlers/mso-api-handler-infra/src/main/java/org/onap/so/apihandlerinfra/OrchestrationRequests.java @@ -271,6 +271,9 @@ public class OrchestrationRequests { request.setRequestScope(iar.getRequestScope()); request.setRequestType(iar.getRequestAction()); String rollbackStatusMessage = iar.getRollbackStatusMessage(); + String flowStatusMessage = iar.getFlowStatus(); + String retryStatusMessage = iar.getRetryStatusMessage(); + InstanceReferences ir = new InstanceReferences(); if(iar.getNetworkId() != null) @@ -324,12 +327,32 @@ public class OrchestrationRequests { String startTimeStamp = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss").format(iar.getStartTime()) + " GMT"; request.setStartTime(startTimeStamp); } - + String statusMessages = null; RequestStatus status = new RequestStatus(); if(iar.getStatusMessage() != null){ - status.setStatusMessage(iar.getStatusMessage()); + statusMessages = "STATUS: " + iar.getStatusMessage(); + } + if(flowStatusMessage != null){ + if(statusMessages != null){ + statusMessages = statusMessages + "/"; + } + statusMessages = statusMessages + "FLOW STATUS: " + flowStatusMessage; + } + if(retryStatusMessage != null){ + if(statusMessages != null){ + statusMessages = statusMessages + "/"; + } + statusMessages = statusMessages + "RETRY STATUS: " + retryStatusMessage; + } + if(rollbackStatusMessage != null){ + if(statusMessages != null){ + statusMessages = statusMessages + "/"; + } + statusMessages = statusMessages + "ROLLBACK STATUS: " + rollbackStatusMessage; + } + if(statusMessages != null){ + status.setStatusMessage(statusMessages); } - if(iar.getEndTime() != null){ String endTimeStamp = new SimpleDateFormat("EEE, dd MMM yyyy HH:mm:ss").format(iar.getEndTime()) + " GMT"; status.setFinishTime(endTimeStamp); @@ -343,10 +366,6 @@ public class OrchestrationRequests { if(iar.getProgress() != null){ status.setPercentProgress(iar.getProgress().intValue()); } - - if(rollbackStatusMessage != null){ - status.setRollbackStatusMessage(rollbackStatusMessage); - } request.setRequestStatus(status); diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateEcompOperationalEnvironmentTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateEcompOperationalEnvironmentTest.java index 3a6839c92a..ce1dde835d 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateEcompOperationalEnvironmentTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/tenantisolation/process/CreateEcompOperationalEnvironmentTest.java @@ -89,7 +89,7 @@ public class CreateEcompOperationalEnvironmentTest extends BaseTest{ .withBody(mapper.writeValueAsString(iar)) .withStatus(HttpStatus.SC_OK))); stubFor(post(urlPathEqualTo("/infraActiveRequests/")) - .withRequestBody(containing("{\"requestId\":\"123\",\"clientRequestId\":null,\"action\":null,\"requestStatus\":\"COMPLETE\",\"statusMessage\":\"SUCCESSFUL, operationalEnvironmentId - operationalEnvId; Success Message: SUCCESSFULLY Created ECOMP OperationalEnvironment.\",\"rollbackStatusMessage\":null,\"progress\":100")) + .withRequestBody(containing("{\"requestId\":\"123\",\"clientRequestId\":null,\"action\":null,\"requestStatus\":\"COMPLETE\",\"statusMessage\":\"SUCCESSFUL, operationalEnvironmentId - operationalEnvId; Success Message: SUCCESSFULLY Created ECOMP OperationalEnvironment.\",\"rollbackStatusMessage\":null,\"flowStatus\":null,\"retryStatusMessage\":null,\"progress\":100")) .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON) .withStatus(HttpStatus.SC_OK))); diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationFilterResponse.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationFilterResponse.json index 2f824d007b..051ac16d77 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationFilterResponse.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationFilterResponse.json @@ -27,7 +27,7 @@ }, "requestStatus": { "requestState": "COMPLETE", - "statusMessage": "COMPLETED", + "statusMessage": "STATUS: COMPLETED", "percentProgress": 100, "finishTime": "Tue, 02 May 2017 06:33:34 GMT" } @@ -61,8 +61,7 @@ }, "requestStatus": { "requestState": "COMPLETE", - "statusMessage": "Vf Module has been deleted successfully.", - "rollbackStatusMessage": "Rollback has been completed successfully.", + "statusMessage": "STATUS: Vf Module has been deleted successfully./FLOW STATUS: Building blocks 1 of 3 completed./ROLLBACK STATUS: Rollback has been completed successfully.", "percentProgress": 100, "finishTime": "Thu, 22 Dec 2016 08:30:28 GMT" } @@ -96,7 +95,7 @@ }, "requestStatus": { "requestState": "PENDING", - "statusMessage": "Vf Module deletion pending.", + "statusMessage": "STATUS: Vf Module deletion pending.", "percentProgress": 0, "finishTime": "Thu, 22 Dec 2016 08:30:28 GMT" } @@ -180,7 +179,7 @@ }, "requestStatus": { "requestState": "UNLOCKED", - "statusMessage": "Vf Module deletion pending.", + "statusMessage": "STATUS: Vf Module deletion pending.", "percentProgress": 0, "finishTime": "Thu, 22 Dec 2016 08:30:28 GMT" } diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationList.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationList.json index 6f928e470a..d24b48ba29 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationList.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/OrchestrationList.json @@ -26,7 +26,7 @@ }, "requestStatus":{ "requestState":"COMPLETE", - "statusMessage":"Vf Module has been deleted successfully.", + "statusMessage":"STATUS: Vf Module has been deleted successfully.", "percentProgress":100 } } @@ -57,8 +57,7 @@ }, "requestStatus":{ "requestState":"PENDING", - "statusMessage":"Vf Module deletion pending.", - "rollbackStatusMessage": "Rollback has been completed successfully.", + "statusMessage":"STATUS: Vf Module deletion pending./FLOW STATUS: Building blocks 1 of 3 completed./RETRY STATUS: Retry 2/5 will be started in 8 min./ROLLBACK STATUS: Rollback has been completed successfully.", "percentProgress":0 } } diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getOrchestrationRequest.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getOrchestrationRequest.json index 231b929372..97132fa037 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getOrchestrationRequest.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getOrchestrationRequest.json @@ -43,6 +43,8 @@ "operationalEnvId": null, "operationalEnvName": null, "rollbackStatusMessage": "Rollback has been completed successfully.", + "flowStatus": "Building blocks 1 of 3 completed.", + "retryStatusMessage": "Retry 2/5 will be started in 8 min.", "requestURI": "00032ab7-na18-42e5-965d-8ea592502018", "_links": { "self": { diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getRequestDetailsFilter.json b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getRequestDetailsFilter.json index a335930601..0f71dd48d3 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getRequestDetailsFilter.json +++ b/mso-api-handlers/mso-api-handler-infra/src/test/resources/OrchestrationRequest/getRequestDetailsFilter.json @@ -92,7 +92,8 @@ "operationalEnvId": null, "operationalEnvName": null, "requestURI": "00032ab7-3fb3-42e5-965d-8ea592502017", - "rollbackStatusMessage": "Rollback has been completed successfully." + "rollbackStatusMessage": "Rollback has been completed successfully.", + "flowStatus":"Building blocks 1 of 3 completed." }, { "requestId": "00032ab7-na18-42e5-965d-8ea592502018", |