diff options
| author |   Jim Hahn <jrh3@att.com> | 2020-04-01 11:03:31 -0400 |
|---|---|---|
| committer | Jim Hahn <jrh3@att.com> | 2020-04-01 12:04:48 -0400 |
| commit | 88fedd4d3edbb581eabe20074a65c32b635fc3b2 (patch) | |
| tree | b932b653aa2d89557f08570d51fc5204459dae93 /models-interactions/model-actors/actor.cds | |
| parent | 3a99e95994963c8fd04d7c038cf6b0263b2bbdeb (diff) | |
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 <jrh3@att.com>
Diffstat (limited to 'models-interactions/model-actors/actor.cds')
2 files changed, 7 insertions, 1 deletions
diff --git a/models-interactions/model-actors/actor.cds/src/main/java/org/onap/policy/controlloop/actor/cds/GrpcOperation.java b/models-interactions/model-actors/actor.cds/src/main/java/org/onap/policy/controlloop/actor/cds/GrpcOperation.java index efe358bad..e57bc041f 100644 --- a/models-interactions/model-actors/actor.cds/src/main/java/org/onap/policy/controlloop/actor/cds/GrpcOperation.java +++ b/models-interactions/model-actors/actor.cds/src/main/java/org/onap/policy/controlloop/actor/cds/GrpcOperation.java @@ -92,6 +92,11 @@ public class GrpcOperation extends OperationPartial { return allOf(() -> params.getContext().obtain(AaiCqResponse.CONTEXT_KEY, cqParams), this::startGuardAsync); } + @Override + public void generateSubRequestId(int attempt) { + setSubRequestId("0"); + } + /** * {@inheritDoc}. */ @@ -167,7 +172,7 @@ public class GrpcOperation extends OperationPartial { // Build CDS gRPC request common-header CommonHeader commonHeader = CommonHeader.newBuilder().setOriginatorId(CdsActorConstants.ORIGINATOR_ID) .setRequestId(params.getContext().getEvent().getRequestId().toString()) - .setSubRequestId(Integer.toString(0)).build(); + .setSubRequestId(getSubRequestId()).build(); // Build CDS gRPC request action-identifier ActionIdentifiers actionIdentifiers = diff --git a/models-interactions/model-actors/actor.cds/src/test/java/org/onap/policy/controlloop/actor/cds/GrpcOperationTest.java b/models-interactions/model-actors/actor.cds/src/test/java/org/onap/policy/controlloop/actor/cds/GrpcOperationTest.java index 81636b194..7baf8aaf7 100644 --- a/models-interactions/model-actors/actor.cds/src/test/java/org/onap/policy/controlloop/actor/cds/GrpcOperationTest.java +++ b/models-interactions/model-actors/actor.cds/src/test/java/org/onap/policy/controlloop/actor/cds/GrpcOperationTest.java @@ -173,6 +173,7 @@ public class GrpcOperationTest { assertEquals(1000, operation.getTimeoutMs(null)); assertEquals(1000, operation.getTimeoutMs(0)); assertEquals(2000, operation.getTimeoutMs(2)); + operation.generateSubRequestId(1); CompletableFuture<OperationOutcome> future3 = operation.startOperationAsync(1, params.makeOutcome()); assertNotNull(future3); } |