summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Hahn <jrh3@att.com>2020-06-11 15:33:32 -0400
committerJim Hahn <jrh3@att.com>2020-06-11 16:44:37 -0400
commit68322db4ff9d41c32eb9af02e84b9a703f1c8ac0 (patch)
tree6055e0c2b1f780dae74b67d31b11e6e9c6fef64d
parent1ce01c244fbcc328e0f03adb78b87fc776b74829 (diff)
Remove deprecated properties for CDS and VFC
Now that the changes to the Actors have been merged, the former properties can be removed, too. Also fixed guard operator/operation name since it changed from "Guard" to "Decision". Issue-ID: POLICY-2629 Change-Id: I1c8d4575be598a8cab12b1aa4ad9b1d3e1f12113 Signed-off-by: Jim Hahn <jrh3@att.com>
-rw-r--r--controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties15
-rw-r--r--controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/EventManagerServices.java8
-rw-r--r--controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager2Test.java4
-rw-r--r--controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties15
4 files changed, 6 insertions, 36 deletions
diff --git a/controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties b/controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties
index a54f5e0b0..b55d16c1b 100644
--- a/controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties
+++ b/controlloop/common/controller-frankfurt/src/test/resources/config/event-manager.properties
@@ -58,13 +58,6 @@ actor.service.CDS.operations.any.username=grpc-username
actor.service.CDS.operations.any.password=grpc-password
actor.service.CDS.operations.any.timeout=10
-# these will be deleted once the actor change has been merged
-actor.service.CDS.any.host=localhost
-actor.service.CDS.any.port=7878
-actor.service.CDS.any.username=grpc-username
-actor.service.CDS.any.password=grpc-password
-actor.service.CDS.any.timeout=10
-
actor.service.SDNC.clientName=SDNC
actor.service.SDNC.operations.BandwidthOnDemand.path=\
GENERIC-RESOURCE-API:vf-module-topology-operation
@@ -88,11 +81,3 @@ actor.service.VFC.operations.Restart.maxGets=20
actor.service.VFC.operations.Restart.waitSecGet=20
actor.service.VFC.operations.Restart.path=ns
actor.service.VFC.operations.Restart.timeoutSec=60
-
-# these will be deleted once the actor change has been merged
-actor.service.VFC.Restart.clientName=VFC
-actor.service.VFC.Restart.pathGet=jobs
-actor.service.VFC.Restart.maxGets=20
-actor.service.VFC.Restart.waitSecGet=20
-actor.service.VFC.Restart.path=ns
-actor.service.VFC.Restart.timeoutSec=60
diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/EventManagerServices.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/EventManagerServices.java
index 8ce3cb188..66b9006a9 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/EventManagerServices.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/EventManagerServices.java
@@ -25,10 +25,10 @@ import java.util.Properties;
import lombok.Getter;
import org.onap.policy.common.parameters.ValidationResult;
import org.onap.policy.common.utils.properties.PropertyObjectUtils;
+import org.onap.policy.controlloop.actor.guard.DecisionOperation;
+import org.onap.policy.controlloop.actor.guard.DecisionOperator;
import org.onap.policy.controlloop.actor.guard.GuardActorServiceProvider;
import org.onap.policy.controlloop.actor.guard.GuardConfig;
-import org.onap.policy.controlloop.actor.guard.GuardOperation;
-import org.onap.policy.controlloop.actor.guard.GuardOperator;
import org.onap.policy.controlloop.actorserviceprovider.ActorService;
import org.onap.policy.controlloop.actorserviceprovider.Util;
import org.onap.policy.controlloop.ophistory.OperationHistoryDataManager;
@@ -103,8 +103,8 @@ public class EventManagerServices {
*/
public boolean isGuardEnabled() {
try {
- GuardOperator guard = (GuardOperator) getActorService().getActor(GuardActorServiceProvider.NAME)
- .getOperator(GuardOperation.NAME);
+ DecisionOperator guard = (DecisionOperator) getActorService().getActor(GuardActorServiceProvider.NAME)
+ .getOperator(DecisionOperation.NAME);
if (!guard.isConfigured()) {
logger.warn("cannot check 'disabled' property in GUARD actor - assuming disabled");
return false;
diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager2Test.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager2Test.java
index 90fdccabb..a5179a9a5 100644
--- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager2Test.java
+++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager2Test.java
@@ -56,8 +56,8 @@ import org.onap.policy.common.utils.time.PseudoExecutor;
import org.onap.policy.controlloop.ControlLoopOperation;
import org.onap.policy.controlloop.ControlLoopResponse;
import org.onap.policy.controlloop.VirtualControlLoopEvent;
+import org.onap.policy.controlloop.actor.guard.DecisionOperation;
import org.onap.policy.controlloop.actor.guard.GuardActorServiceProvider;
-import org.onap.policy.controlloop.actor.guard.GuardOperation;
import org.onap.policy.controlloop.actorserviceprovider.ActorService;
import org.onap.policy.controlloop.actorserviceprovider.Operation;
import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome;
@@ -931,7 +931,7 @@ public class ControlLoopOperationManager2Test {
private OperationOutcome genGuardOutcome(boolean permit) {
OperationOutcome outcome = mgr.getParams().makeOutcome();
outcome.setActor(GuardActorServiceProvider.NAME);
- outcome.setOperation(GuardOperation.NAME);
+ outcome.setOperation(DecisionOperation.NAME);
outcome.setStart(Instant.now());
mgr.getParams().callbackStarted(new OperationOutcome(outcome));
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties b/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties
index 5a4bf04d9..08d761d3a 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/config/event-manager.properties
@@ -59,13 +59,6 @@ actor.service.CDS.operations.any.username=${envd:CDS_GRPC_USERNAME:}
actor.service.CDS.operations.any.password=${envd:CDS_GRPC_PASSWORD:}
actor.service.CDS.operations.any.timeout=10
-# these will be deleted once the actor change has been merged
-actor.service.CDS.any.host=${envd:CDS_GRPC_HOST:}
-actor.service.CDS.any.port=${envd:CDS_GRPC_PORT:}
-actor.service.CDS.any.username=${envd:CDS_GRPC_USERNAME:}
-actor.service.CDS.any.password=${envd:CDS_GRPC_PASSWORD:}
-actor.service.CDS.any.timeout=10
-
actor.service.SDNC.clientName=SDNC
actor.service.SDNC.operations.BandwidthOnDemand.path=\
GENERIC-RESOURCE-API:vf-module-topology-operation
@@ -89,11 +82,3 @@ actor.service.VFC.operations.Restart.maxGets=20
actor.service.VFC.operations.Restart.waitSecGet=20
actor.service.VFC.operations.Restart.path=ns
actor.service.VFC.operations.Restart.timeoutSec=60
-
-# these will be deleted once the actor change has been merged
-actor.service.VFC.Restart.clientName=VFC
-actor.service.VFC.Restart.pathGet=jobs
-actor.service.VFC.Restart.maxGets=20
-actor.service.VFC.Restart.waitSecGet=20
-actor.service.VFC.Restart.path=ns
-actor.service.VFC.Restart.timeoutSec=60