aboutsummaryrefslogtreecommitdiffstats
path: root/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/execution/VTPExecutionResource.java
diff options
context:
space:
mode:
Diffstat (limited to 'vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/execution/VTPExecutionResource.java')
-rw-r--r--vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/execution/VTPExecutionResource.java24
1 files changed, 15 insertions, 9 deletions
diff --git a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/execution/VTPExecutionResource.java b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/execution/VTPExecutionResource.java
index 1f588c1f..e0513360 100644
--- a/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/execution/VTPExecutionResource.java
+++ b/vnfmarket-be/vnf-sdk-marketplace/src/main/java/org/onap/vtp/execution/VTPExecutionResource.java
@@ -88,17 +88,23 @@ public class VTPExecutionResource extends VTPResource{
execution.setEndTime(endTime);
execution.setExecutionId(output.getAddonsMap().get("execution-id"));
+ // set execution status based on success from test.
if (output.getSuccess()) {
- execution.setStatus(VTPTestExecution.Status.COMPLETED.name());
+ execution.setStatus(VTPTestExecution.Status.COMPLETED.name());
+ }
+ else {
+ execution.setStatus(VTPTestExecution.Status.FAILED.name());
+ }
- ObjectMapper mapper = new ObjectMapper();
- JsonNode resultJson = mapper.readTree(output.getAttrsMap().get("results"));
- execution.setResults(resultJson);
- } else {
- execution.setStatus(VTPTestExecution.Status.FAILED.name());
- ObjectMapper mapper = new ObjectMapper();
- JsonNode resultJson = mapper.readTree(output.getAttrsMap().get("error"));
- execution.setResults(resultJson);
+ // set the results from what is available in the output independent of status.
+ // tests can fail but still produce results.
+ ObjectMapper mapper = new ObjectMapper();
+ Map<String,String> m = output.getAttrsMap();
+ if (m.containsKey("results")) {
+ execution.setResults(mapper.readTree(m.get("results")));
+ }
+ else if (m.containsKey("error")) {
+ execution.setResults(mapper.readTree(m.get("error")));
}
}