From 88fedd4d3edbb581eabe20074a65c32b635fc3b2 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Wed, 1 Apr 2020 11:03:31 -0400 Subject: Set sub request ID before start callback Modified new actor code to generate the sub request ID before invoking the start callback. Issue-ID: POLICY-2461 Change-Id: I4adabd6efda2c30c0e2da31f95f01dd5fe546c0a Signed-off-by: Jim Hahn --- .../policy/controlloop/actor/sdnr/ModifyConfigOperation.java | 8 +++----- .../org/onap/policy/controlloop/actor/sdnr/SdnrOperation.java | 10 ++++------ .../controlloop/actor/sdnr/ModifyConfigOperationTest.java | 8 ++++---- .../onap/policy/controlloop/actor/sdnr/SdnrOperationTest.java | 10 +++++----- 4 files changed, 16 insertions(+), 20 deletions(-) (limited to 'models-interactions/model-actors/actor.sdnr/src') 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 a5193ec52..2b7f644b6 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,7 +20,6 @@ package org.onap.policy.controlloop.actor.sdnr; -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.PciMessage; @@ -39,14 +38,13 @@ public class ModifyConfigOperation extends SdnrOperation { } @Override - protected Pair makeRequest(int attempt) { - final Pair req = super.makeRequest(attempt); - final PciMessage request = req.getRight(); + protected PciMessage makeRequest(int attempt) { + final PciMessage request = super.makeRequest(attempt); // // Set the recipe and action information // request.setRpcName(NAME.toLowerCase()); request.getBody().getInput().setAction(NAME); - return req; + return request; } } 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 de498e6ab..b5066c72a 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 @@ -21,9 +21,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; @@ -62,7 +60,7 @@ public abstract class SdnrOperation extends BidirectionalTopicOperation getExpectedKeyValues(int attempt, PciMessage request) { - return List.of(request.getBody().getInput().getCommonHeader().getSubRequestId()); + return List.of(getSubRequestId()); } @Override @@ -128,9 +126,9 @@ public abstract class SdnrOperation extends BidirectionalTopicOperation makeRequest(int attempt) { + protected PciMessage makeRequest(int attempt) { VirtualControlLoopEvent onset = params.getContext().getEvent(); - String subRequestId = UUID.randomUUID().toString(); + String subRequestId = getSubRequestId(); /* Construct an SDNR request using pci Model */ @@ -159,6 +157,6 @@ public abstract class SdnrOperation extends BidirectionalTopicOperation result = oper.makeRequest(1); - assertNotNull(result.getLeft()); - assertNotNull(result.getRight()); + oper.generateSubRequestId(1); + + PciMessage request = oper.makeRequest(1); + assertNotNull(request); } } 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 8f58f7d87..836b1ae57 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,7 +26,6 @@ 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.After; import org.junit.AfterClass; import org.junit.Before; @@ -78,10 +77,9 @@ public class SdnrOperationTest extends BasicSdnrOperation { @Test public void testMakeRequest() { - Pair result = operation.makeRequest(1); - assertNotNull(result.getLeft()); + operation.generateSubRequestId(1); - PciMessage request = result.getRight(); + PciMessage request = operation.makeRequest(1); assertNotNull(request.getBody()); assertEquals("1.0", request.getVersion()); @@ -94,7 +92,9 @@ public class SdnrOperationTest extends BasicSdnrOperation { @Test public void testGetExpectedKeyValues() { - PciMessage request = operation.makeRequest(1).getRight(); + operation.generateSubRequestId(1); + + PciMessage request = operation.makeRequest(1); assertEquals(Arrays.asList(request.getBody().getInput().getCommonHeader().getSubRequestId()), operation.getExpectedKeyValues(50, request)); } -- cgit 1.2.3-korg