From 27c0d0c0a925e4fa0fed41fd7cf794b02be15595 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Tue, 20 Jul 2021 17:34:22 -0400 Subject: 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 --- .../src/test/java/org/onap/policy/controlloop/UsecasesTest.java | 4 ++-- .../drools/apps/controller/usecases/step/GuardStep2Test.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'controlloop/common/controller-usecases/src/test/java') diff --git a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/UsecasesTest.java b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/UsecasesTest.java index 8b0403df3..ef40d302e 100644 --- a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/UsecasesTest.java +++ b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/controlloop/UsecasesTest.java @@ -2,7 +2,7 @@ * ============LICENSE_START======================================================= * ONAP * ================================================================================ - * Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2020-2021 AT&T Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -55,7 +55,7 @@ public class UsecasesTest extends DroolsRuleTest { rules.configure("src/main/resources"); httpClients.addClients("usecases"); - simulators.start(Util::buildAaiSim, Util::buildSoSim, Util::buildVfcSim, Util::buildGuardSim, + simulators.start(Util::buildAaiSim, Util::buildSoSim, Util::buildVfcSim, Util::buildXacmlSim, Util::buildSdncSim); rules.start(); diff --git a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/GuardStep2Test.java b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/GuardStep2Test.java index d5945a30c..ffd88d54d 100644 --- a/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/GuardStep2Test.java +++ b/controlloop/common/controller-usecases/src/test/java/org/onap/policy/drools/apps/controller/usecases/step/GuardStep2Test.java @@ -45,9 +45,9 @@ import org.onap.aai.domain.yang.RelationshipList; import org.onap.aai.domain.yang.Vserver; import org.onap.policy.aai.AaiCqResponse; import org.onap.policy.controlloop.VirtualControlLoopEvent; -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; @@ -182,8 +182,8 @@ public class GuardStep2Test { @Test public void testConstructor() { - assertEquals(GuardActor.NAME, step.getActorName()); - assertEquals(DecisionOperation.NAME, step.getOperationName()); + assertEquals(XacmlActor.NAME, step.getActorName()); + assertEquals(GuardOperation.NAME, step.getOperationName()); assertSame(stepContext, step.stepContext); assertSame(event, step.event); -- cgit 1.2.3-korg