From 2440b81428fa4bfa28a51f87c58e12c78ced744b Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 6 Mar 2020 18:22:28 -0500 Subject: Add subrequest ID to OperationOutcome Rule notifications need the subrequest ID to be populated in the OperationOutcome object, where possible. Issue-ID: POLICY-2385 Signed-off-by: Jim Hahn Change-Id: Ic44320f67ad8df7bcb3000cfa667f95427818e71 --- .../org/onap/policy/controlloop/actor/sdnc/SdncOperation.java | 1 + .../onap/policy/controlloop/actor/sdnc/BasicSdncOperation.java | 3 +++ .../onap/policy/controlloop/actor/sdnc/SdncOperationTest.java | 9 +++++++++ 3 files changed, 13 insertions(+) (limited to 'models-interactions/model-actors/actor.sdnc/src') diff --git a/models-interactions/model-actors/actor.sdnc/src/main/java/org/onap/policy/controlloop/actor/sdnc/SdncOperation.java b/models-interactions/model-actors/actor.sdnc/src/main/java/org/onap/policy/controlloop/actor/sdnc/SdncOperation.java index 018578829..1aed75ce6 100644 --- a/models-interactions/model-actors/actor.sdnc/src/main/java/org/onap/policy/controlloop/actor/sdnc/SdncOperation.java +++ b/models-interactions/model-actors/actor.sdnc/src/main/java/org/onap/policy/controlloop/actor/sdnc/SdncOperation.java @@ -61,6 +61,7 @@ public abstract class SdncOperation extends HttpOperation { protected CompletableFuture startOperationAsync(int attempt, OperationOutcome outcome) { SdncRequest request = makeRequest(attempt); + outcome.setSubRequestId(request.getHealRequest().getRequestHeaderInfo().getSvcRequestId()); Entity entity = Entity.entity(request, MediaType.APPLICATION_JSON); diff --git a/models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/BasicSdncOperation.java b/models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/BasicSdncOperation.java index 50e97496a..73b81433a 100644 --- a/models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/BasicSdncOperation.java +++ b/models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/BasicSdncOperation.java @@ -23,6 +23,7 @@ package org.onap.policy.controlloop.actor.sdnc; import static org.assertj.core.api.Assertions.assertThatIllegalArgumentException; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.verify; @@ -107,6 +108,8 @@ public abstract class BasicSdncOperation extends BasicHttpOperation assertEquals(PolicyResult.SUCCESS, future2.get().getResult()); + assertNotNull(future2.get().getSubRequestId()); + return requestCaptor.getValue().getEntity(); } diff --git a/models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/SdncOperationTest.java b/models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/SdncOperationTest.java index a83c354d2..417029d49 100644 --- a/models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/SdncOperationTest.java +++ b/models-interactions/model-actors/actor.sdnc/src/test/java/org/onap/policy/controlloop/actor/sdnc/SdncOperationTest.java @@ -29,6 +29,8 @@ import java.util.Map; import java.util.TreeMap; import org.junit.Before; import org.junit.Test; +import org.onap.policy.sdnc.SdncHealRequest; +import org.onap.policy.sdnc.SdncHealRequestHeaderInfo; import org.onap.policy.sdnc.SdncRequest; public class SdncOperationTest extends BasicSdncOperation { @@ -48,6 +50,13 @@ public class SdncOperationTest extends BasicSdncOperation { request = new SdncRequest(); request.setUrl(MY_URI); + SdncHealRequest healRequest = new SdncHealRequest(); + request.setHealRequest(healRequest); + + SdncHealRequestHeaderInfo headerInfo = new SdncHealRequestHeaderInfo(); + healRequest.setRequestHeaderInfo(headerInfo); + headerInfo.setSvcRequestId(SUB_REQ_ID); + oper = new SdncOperation(params, config) { @Override protected SdncRequest makeRequest(int attempt) { -- cgit 1.2.3-korg