diff options
| author |   Ram Krishna Verma <ram_krishna.verma@bell.ca> | 2020-11-23 15:25:48 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-11-23 15:25:48 +0000 |
| commit | 3697d494f3ef4c23c391ee0a6a7ac7e226a2f3d8 (patch) | |
| tree | bf618f0ae6fabcca8ce470a40a1f7d4875583149 | |
| parent | 2883cbc1e3a2754c40cf5683ce98f9a18f5aee0b (diff) | |
| parent | 74332b54731f535624a6a7ddb27bb048cc36c95e (diff) | |
Merge "Use Params makeOutcome() without targetEntity"
| -rw-r--r-- | controlloop/common/controller-usecases/src/main/resources/usecases.drl | 2 | ||||
| -rw-r--r-- | controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/Step.java | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/controlloop/common/controller-usecases/src/main/resources/usecases.drl b/controlloop/common/controller-usecases/src/main/resources/usecases.drl index 578bd9ca4..12c9849f9 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(null); + OperationOutcome outcome = $step.getParams().makeOutcome(); outcome.setStart(Instant.now()); outcome.setEnd(outcome.getStart()); diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/Step.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/Step.java index d406e6efe..15070bdad 100644 --- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/Step.java +++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/Step.java @@ -270,7 +270,10 @@ public class Step { * @return a new operation outcome */ public OperationOutcome makeOutcome() { - return params.makeOutcome(operation.getProperty(OperationProperties.AAI_TARGET_ENTITY)); + OperationOutcome outcome = params.makeOutcome(); + outcome.setTarget(operation.getProperty(OperationProperties.AAI_TARGET_ENTITY)); + + return outcome; } @Override |