diff options
Diffstat (limited to 'models-interactions/model-actors/actor.sdnr')
2 files changed, 9 insertions, 5 deletions
diff --git a/models-interactions/model-actors/actor.sdnr/src/main/java/org/onap/policy/controlloop/actor/sdnr/SdnrOperation.java b/models-interactions/model-actors/actor.sdnr/src/main/java/org/onap/policy/controlloop/actor/sdnr/SdnrOperation.java index 40face7fa..d0bb38e43 100644 --- a/models-interactions/model-actors/actor.sdnr/src/main/java/org/onap/policy/controlloop/actor/sdnr/SdnrOperation.java +++ b/models-interactions/model-actors/actor.sdnr/src/main/java/org/onap/policy/controlloop/actor/sdnr/SdnrOperation.java @@ -118,20 +118,22 @@ public class SdnrOperation extends BidirectionalTopicOperation<PciMessage, PciMe */ @Override public OperationOutcome setOutcome(OperationOutcome outcome, PolicyResult result, PciMessage responseWrapper) { + outcome.setResponse(responseWrapper); + if (responseWrapper.getBody() == null || responseWrapper.getBody().getOutput() == null) { outcome.setControlLoopResponse(makeControlLoopResponse(null)); return setOutcome(outcome, result); } - PciResponse response = responseWrapper.getBody().getOutput(); - if (response.getStatus() == null || response.getStatus().getValue() == null) { - outcome.setControlLoopResponse(makeControlLoopResponse(response.getPayload())); + PciResponse pciResponse = responseWrapper.getBody().getOutput(); + if (pciResponse.getStatus() == null || pciResponse.getStatus().getValue() == null) { + outcome.setControlLoopResponse(makeControlLoopResponse(pciResponse.getPayload())); return setOutcome(outcome, result); } outcome.setResult(result); - outcome.setMessage(response.getStatus().getValue()); - outcome.setControlLoopResponse(makeControlLoopResponse(response.getPayload())); + outcome.setMessage(pciResponse.getStatus().getValue()); + outcome.setControlLoopResponse(makeControlLoopResponse(pciResponse.getPayload())); return outcome; } diff --git a/models-interactions/model-actors/actor.sdnr/src/test/java/org/onap/policy/controlloop/actor/sdnr/SdnrOperationTest.java b/models-interactions/model-actors/actor.sdnr/src/test/java/org/onap/policy/controlloop/actor/sdnr/SdnrOperationTest.java index 2bb0d9469..370d6768e 100644 --- a/models-interactions/model-actors/actor.sdnr/src/test/java/org/onap/policy/controlloop/actor/sdnr/SdnrOperationTest.java +++ b/models-interactions/model-actors/actor.sdnr/src/test/java/org/onap/policy/controlloop/actor/sdnr/SdnrOperationTest.java @@ -135,6 +135,7 @@ public class SdnrOperationTest extends BasicSdnrOperation { outcome = operation.start().get(); assertEquals(PolicyResult.SUCCESS, outcome.getResult()); + assertTrue(outcome.getResponse() instanceof PciMessage); ControlLoopResponse clresp = outcome.getControlLoopResponse(); assertNotNull(clresp); @@ -243,5 +244,6 @@ public class SdnrOperationTest extends BasicSdnrOperation { assertSame(outcome, operation.setOutcome(outcome, PolicyResult.SUCCESS, response)); assertEquals(PolicyResult.SUCCESS, outcome.getResult()); assertNotNull(outcome.getMessage()); + assertSame(response, outcome.getResponse()); } } |