From 3d776b9d24b73b366b2f1e70b6c536e4d2705202 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Wed, 18 Nov 2020 12:04:26 -0500 Subject: Delete preprocessed flag from actors Removed the "preprocessed" flag from the Actor parameters, now that the actors no longer have a startPreprocess() method. Also removed targetEntity from the parameters. Issue-ID: POLICY-2804 Change-Id: I13bc80e1b6bb22d8d21b176796ca062109ce6658 Signed-off-by: Jim Hahn --- .../policy/drools/apps/controller/usecases/UsecasesEventManager.java | 1 - controlloop/common/controller-usecases/src/main/resources/usecases.drl | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) (limited to 'controlloop/common/controller-usecases/src/main') diff --git a/controlloop/common/controller-usecases/src/main/java/org/onap/policy/drools/apps/controller/usecases/UsecasesEventManager.java b/controlloop/common/controller-usecases/src/main/java/org/onap/policy/drools/apps/controller/usecases/UsecasesEventManager.java index 091b26b2d..0649f1882 100644 --- a/controlloop/common/controller-usecases/src/main/java/org/onap/policy/drools/apps/controller/usecases/UsecasesEventManager.java +++ b/controlloop/common/controller-usecases/src/main/java/org/onap/policy/drools/apps/controller/usecases/UsecasesEventManager.java @@ -338,7 +338,6 @@ public class UsecasesEventManager extends ControlLoopEventManager implements Ste .actor(actor.getActor()) .operation(actor.getOperation()) .requestId(event.getRequestId()) - .preprocessed(true) .executor(getExecutor()) .retry(policy.getRetries()) .timeoutSec(policy.getTimeout()) diff --git a/controlloop/common/controller-usecases/src/main/resources/usecases.drl b/controlloop/common/controller-usecases/src/main/resources/usecases.drl index 12c9849f9..578bd9ca4 100644 --- a/controlloop/common/controller-usecases/src/main/resources/usecases.drl +++ b/controlloop/common/controller-usecases/src/main/resources/usecases.drl @@ -395,7 +395,7 @@ rule "EVENT.MANAGER.EXECUTE.STEP" if (guardDisabled && "GUARD".equals($step.getActorName())) { // guard is disabled - just enqueue a "SUCCESS" (i.e., "Permit") - OperationOutcome outcome = $step.getParams().makeOutcome(); + OperationOutcome outcome = $step.getParams().makeOutcome(null); outcome.setStart(Instant.now()); outcome.setEnd(outcome.getStart()); -- cgit 1.2.3-korg