diff options
Diffstat (limited to 'models-interactions/model-actors/actor.sdnr')
2 files changed, 0 insertions, 40 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 d0bb38e43..6c8f45d94 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 @@ -22,7 +22,6 @@ package org.onap.policy.controlloop.actor.sdnr; import java.util.List; import java.util.concurrent.CompletableFuture; -import org.onap.policy.controlloop.ControlLoopResponse; import org.onap.policy.controlloop.VirtualControlLoopEvent; import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome; import org.onap.policy.controlloop.actorserviceprovider.impl.BidirectionalTopicOperation; @@ -121,45 +120,19 @@ public class SdnrOperation extends BidirectionalTopicOperation<PciMessage, PciMe outcome.setResponse(responseWrapper); if (responseWrapper.getBody() == null || responseWrapper.getBody().getOutput() == null) { - outcome.setControlLoopResponse(makeControlLoopResponse(null)); return setOutcome(outcome, result); } 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(pciResponse.getStatus().getValue()); - outcome.setControlLoopResponse(makeControlLoopResponse(pciResponse.getPayload())); return outcome; } - /** - * Converts the SDNR response to a ControlLoopResponse. - * - * @param responsePayload payload from the response - * - * @return a new ControlLoopResponse - */ - private ControlLoopResponse makeControlLoopResponse(String responsePayload) { - VirtualControlLoopEvent event = params.getContext().getEvent(); - - ControlLoopResponse clRsp = new ControlLoopResponse(); - clRsp.setPayload(responsePayload); - clRsp.setFrom(params.getActor()); - clRsp.setTarget("DCAE"); - clRsp.setClosedLoopControlName(event.getClosedLoopControlName()); - clRsp.setPolicyName(event.getPolicyName()); - clRsp.setPolicyVersion(event.getPolicyVersion()); - clRsp.setRequestId(event.getRequestId()); - clRsp.setVersion(event.getVersion()); - - return clRsp; - } - @Override protected PciMessage makeRequest(int attempt) { VirtualControlLoopEvent onset = params.getContext().getEvent(); 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 370d6768e..7e9d263ad 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 @@ -36,7 +36,6 @@ import org.junit.AfterClass; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; -import org.onap.policy.controlloop.ControlLoopResponse; import org.onap.policy.controlloop.actor.test.BasicBidirectionalTopicOperation; import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome; import org.onap.policy.controlloop.actorserviceprovider.controlloop.ControlLoopEventContext; @@ -136,18 +135,6 @@ 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); - - assertEquals(DEFAULT_ACTOR, clresp.getFrom()); - assertEquals("DCAE", clresp.getTarget()); - assertEquals(CL_NAME, clresp.getClosedLoopControlName()); - assertEquals(EVENT_POLICY_NAME, clresp.getPolicyName()); - assertEquals(EVENT_POLICY_VERSION, clresp.getPolicyVersion()); - assertEquals(EVENT_VERSION, clresp.getVersion()); - assertEquals(REQ_ID, clresp.getRequestId()); - assertNotNull(clresp.getPayload()); } @Test |