Use new xacml actor in drools-apps

Modified drools-apps to use actor.xacml instead of actor.guard.
This included updating property files.

Issue-ID: POLICY-3503
Change-Id: I25c5586c59a2adaae9f4f0f5ca66e14b12b0c18a
Signed-off-by: Jim Hahn <jrh3@att.com>

2 files changed, 10 insertions, 12 deletions

diff --git a/controlloop/common/controller-usecases/src/main/java/org/onap/policy/drools/apps/controller/usecases/step/GuardStep2.java b/controlloop/common/controller-usecases/src/main/java/org/onap/policy/drools/apps/controller/usecases/step/GuardStep2.java
index abc9ff2b2..840d1417d 100644
--- a/controlloop/common/controller-usecases/src/main/java/org/onap/policy/drools/apps/controller/usecases/step/GuardStep2.java
+++ b/controlloop/common/controller-usecases/src/main/java/org/onap/policy/drools/apps/controller/usecases/step/GuardStep2.java
@@ -29,9 +29,9 @@ import org.onap.aai.domain.yang.RelatedToProperty;
 import org.onap.aai.domain.yang.Relationship;
 import org.onap.aai.domain.yang.RelationshipData;
 import org.onap.policy.aai.AaiCqResponse;
-import org.onap.policy.controlloop.actor.guard.DecisionOperation;
-import org.onap.policy.controlloop.actor.guard.GuardActor;
 import org.onap.policy.controlloop.actor.so.VfModuleCreate;
+import org.onap.policy.controlloop.actor.xacml.GuardOperation;
+import org.onap.policy.controlloop.actor.xacml.XacmlActor;
 import org.onap.policy.controlloop.actorserviceprovider.Operation;
 import org.onap.policy.controlloop.actorserviceprovider.OperationProperties;
 import org.onap.policy.controlloop.actorserviceprovider.TargetType;
@@ -64,7 +64,7 @@ public class GuardStep2 extends Step2 {
      * @param otherStep step whose information should be used
      */
     public GuardStep2(Step2 otherStep, String closedLoopControlName) {
-        super(otherStep, GuardActor.NAME, DecisionOperation.NAME);
+        super(otherStep, XacmlActor.NAME, GuardOperation.NAME);
 
         if (!otherStep.isInitialized()) {
             throw new IllegalStateException("policy operation must be initialized before the guard operation");
diff --git a/controlloop/common/controller-usecases/src/main/resources/usecases.drl b/controlloop/common/controller-usecases/src/main/resources/usecases.drl
index 5074215bb..932b08cf6 100644
--- a/controlloop/common/controller-usecases/src/main/resources/usecases.drl
+++ b/controlloop/common/controller-usecases/src/main/resources/usecases.drl
@@ -27,11 +27,7 @@ import org.onap.policy.controlloop.CanonicalOnset;
 import org.onap.policy.controlloop.VirtualControlLoopEvent;
 import org.onap.policy.controlloop.VirtualControlLoopNotification;
 import org.onap.policy.controlloop.ControlLoopNotificationType;
-import org.onap.policy.controlloop.actor.aai.AaiActor;
-import org.onap.policy.controlloop.actor.aai.AaiGetPnfOperation;
-import org.onap.policy.controlloop.actor.aai.AaiGetTenantOperation;
-import org.onap.policy.controlloop.actor.guard.GuardActor;
-import org.onap.policy.controlloop.actor.guard.DecisionOperation;
+import org.onap.policy.controlloop.actor.xacml.XacmlActor;
 import org.onap.policy.controlloop.actorserviceprovider.Operation;
 import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome;
 import org.onap.policy.controlloop.actorserviceprovider.OperationFinalResult;
@@ -45,6 +41,7 @@ import org.onap.policy.drools.apps.controller.usecases.UsecasesEventManager;
 import org.onap.policy.controlloop.eventmanager.ClEventManagerWithSteps.State;
 import org.onap.policy.controlloop.eventmanager.ClEventManagerWithOutcome.OperationOutcome2;
 import org.onap.policy.controlloop.eventmanager.ClEventManagerWithEvent.NewEventStatus;
+import org.onap.policy.controlloop.eventmanager.ControlLoopEventManager;
 import org.onap.policy.controlloop.eventmanager.EventManagerServices;
 import org.onap.policy.models.tosca.authorative.concepts.ToscaPolicy;
 
@@ -415,9 +412,10 @@ rule "EVENT.MANAGER.EXECUTE.STEP"
         $step.setProperties();
 
         boolean guardDisabled = "true".equalsIgnoreCase(
-                    PolicyEngineConstants.getManager().getEnvironmentProperty("guard.disabled"));
+                    PolicyEngineConstants.getManager().getEnvironmentProperty(
+                        ControlLoopEventManager.GUARD_DISABLED_PROPERTY));
 
-        if (guardDisabled && "GUARD".equals($step.getActorName())) {
+        if (guardDisabled && XacmlActor.NAME.equals($step.getActorName())) {
             // guard is disabled - just enqueue a "SUCCESS" (i.e., "Permit")
             OperationOutcome outcome = $step.getParams().makeOutcome();
             outcome.setStart(Instant.now());
@@ -498,8 +496,8 @@ rule "EVENT.MANAGER.PROCESS.GUARD.OUTCOME"
                         $outcome != null,
                         !isAbort($outcome),
                         $step : getSteps().peek(),
-                        "GUARD".equals($step.getActorName()),
-                        $outcome.isFor("GUARD", $step.getOperationName()) )
+                        XacmlActor.NAME.equals($step.getActorName()),
+                        $outcome.isFor($step.getActorName(), $step.getOperationName()) )
     then
 
     Logger logger = LoggerFactory.getLogger(drools.getRule().getPackage());