diff options
Diffstat (limited to 'models-interactions/model-actors/actor.sdnr')
4 files changed, 19 insertions, 22 deletions
diff --git a/models-interactions/model-actors/actor.sdnr/src/main/java/org/onap/policy/controlloop/actor/sdnr/ModifyConfigOperation.java b/models-interactions/model-actors/actor.sdnr/src/main/java/org/onap/policy/controlloop/actor/sdnr/ModifyConfigOperation.java index 67c3d4521..21f1562cf 100644 --- a/models-interactions/model-actors/actor.sdnr/src/main/java/org/onap/policy/controlloop/actor/sdnr/ModifyConfigOperation.java +++ b/models-interactions/model-actors/actor.sdnr/src/main/java/org/onap/policy/controlloop/actor/sdnr/ModifyConfigOperation.java @@ -20,17 +20,12 @@ package org.onap.policy.controlloop.actor.sdnr; -import java.util.concurrent.CompletableFuture; -import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome; +import org.apache.commons.lang3.tuple.Pair; import org.onap.policy.controlloop.actorserviceprovider.parameters.BidirectionalTopicConfig; import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams; import org.onap.policy.sdnr.PciRequestWrapper; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class ModifyConfigOperation extends SdnrOperation { - private static final Logger logger = LoggerFactory.getLogger(ModifyConfigOperation.class); - public static final String NAME = "ModifyConfig"; /** @@ -44,14 +39,14 @@ public class ModifyConfigOperation extends SdnrOperation { } @Override - protected PciRequestWrapper makeRequest(int attempt) { - PciRequestWrapper request = super.makeRequest(attempt); + protected Pair<String, PciRequestWrapper> makeRequest(int attempt) { + final Pair<String, PciRequestWrapper> req = super.makeRequest(attempt); + final PciRequestWrapper request = req.getRight(); // // Set the recipe and action information // request.setRpcName(NAME.toLowerCase()); request.getBody().setAction(NAME); - logger.info("SDNR ModifyConfig Request to be sent is {}", request); - return request; + return req; } } 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 5faa31d7c..b11c701b2 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 @@ -23,6 +23,7 @@ package org.onap.policy.controlloop.actor.sdnr; import java.util.List; import java.util.UUID; import java.util.concurrent.CompletableFuture; +import org.apache.commons.lang3.tuple.Pair; import org.onap.policy.controlloop.VirtualControlLoopEvent; import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome; import org.onap.policy.controlloop.actorserviceprovider.impl.BidirectionalTopicOperation; @@ -124,7 +125,7 @@ public abstract class SdnrOperation extends BidirectionalTopicOperation<PciReque } @Override - protected PciRequestWrapper makeRequest(int attempt) { + protected Pair<String, PciRequestWrapper> makeRequest(int attempt) { VirtualControlLoopEvent onset = params.getContext().getEvent(); String subRequestId = UUID.randomUUID().toString(); @@ -158,6 +159,6 @@ public abstract class SdnrOperation extends BidirectionalTopicOperation<PciReque logger.info("SDNR Request to be sent is {}", dmaapRequest); /* Return the request to be sent through dmaap. */ - return dmaapRequest; + return Pair.of(subRequestId, dmaapRequest); } } diff --git a/models-interactions/model-actors/actor.sdnr/src/test/java/org/onap/policy/controlloop/actor/sdnr/ModifyConfigOperationTest.java b/models-interactions/model-actors/actor.sdnr/src/test/java/org/onap/policy/controlloop/actor/sdnr/ModifyConfigOperationTest.java index d1e192277..19b2063da 100644 --- a/models-interactions/model-actors/actor.sdnr/src/test/java/org/onap/policy/controlloop/actor/sdnr/ModifyConfigOperationTest.java +++ b/models-interactions/model-actors/actor.sdnr/src/test/java/org/onap/policy/controlloop/actor/sdnr/ModifyConfigOperationTest.java @@ -29,6 +29,7 @@ import static org.mockito.Mockito.when; import java.util.concurrent.CompletableFuture; import java.util.concurrent.atomic.AtomicBoolean; +import org.apache.commons.lang3.tuple.Pair; import org.junit.Before; import org.junit.Test; import org.onap.policy.common.utils.coder.CoderException; @@ -88,7 +89,8 @@ public class ModifyConfigOperationTest extends BasicSdnrOperation { @Test public void testMakeRequest() throws CoderException { - PciRequestWrapper request = oper.makeRequest(1); - assertNotNull(request); + Pair<String, PciRequestWrapper> result = oper.makeRequest(1); + assertNotNull(result.getLeft()); + assertNotNull(result.getRight()); } } 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 fc7e86a94..a7bfa3322 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 @@ -26,6 +26,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertSame; import java.util.Arrays; +import org.apache.commons.lang3.tuple.Pair; import org.junit.Before; import org.junit.Test; import org.onap.policy.controlloop.actorserviceprovider.impl.BidirectionalTopicOperation.Status; @@ -45,12 +46,7 @@ public class SdnrOperationTest extends BasicSdnrOperation { public void setUp() throws Exception { super.setUp(); - operation = new SdnrOperation(params, config) { - @Override - protected PciRequestWrapper makeRequest(int attempt) { - return super.makeRequest(attempt); - } - }; + operation = new SdnrOperation(params, config) {}; } @Test @@ -61,7 +57,10 @@ public class SdnrOperationTest extends BasicSdnrOperation { @Test public void testMakeRequest() { - PciRequestWrapper request = operation.makeRequest(1); + Pair<String, PciRequestWrapper> result = operation.makeRequest(1); + assertNotNull(result.getLeft()); + + PciRequestWrapper request = result.getRight(); assertNotNull(request.getBody()); assertEquals("1.0", request.getVersion()); @@ -74,7 +73,7 @@ public class SdnrOperationTest extends BasicSdnrOperation { @Test public void testGetExpectedKeyValues() { - PciRequestWrapper request = operation.makeRequest(1); + PciRequestWrapper request = operation.makeRequest(1).getRight(); assertEquals(Arrays.asList(request.getBody().getCommonHeader().getSubRequestId()), operation.getExpectedKeyValues(50, request)); |