commit 442a2a8dd64c724363433e6e4794eb19da66314b
author Pamela Dragosh <pdragosh@research.att.com> Tue Jun 02 17:29:10 2020 +0000
committer Gerrit Code Review <gerrit@onap.org> Tue Jun 02 17:29:10 2020 +0000
tree 9ff731f415681a25ad9cd9f99cc6bba3a51c1c92
parent 14cf31576f23ca3f4d1dc2769ae65323652d5944
parent 1e39c988604c9ffb8efc38ef3cf4d635b202c7b9

Merge "Use OperationsHistory from models"

controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager2.java

diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager2.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager2.java
index 2d5ff39..5141b71 100644
--- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager2.java
+++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopOperationManager2.java
@@ -43,6 +43,8 @@
 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.GuardActorServiceProvider;
+import org.onap.policy.controlloop.actor.sdnr.SdnrActorServiceProvider;
 import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome;
 import org.onap.policy.controlloop.actorserviceprovider.controlloop.ControlLoopEventContext;
 import org.onap.policy.controlloop.actorserviceprovider.parameters.ControlLoopOperationParams;
@@ -65,7 +67,7 @@
     private static final String CL_TIMEOUT_ACTOR = "-CL-TIMEOUT-";
     public static final String LOCK_ACTOR = "LOCK";
     public static final String LOCK_OPERATION = "Lock";
-    private static final String GUARD_ACTOR = "GUARD";
+    private static final String GUARD_ACTOR = GuardActorServiceProvider.NAME;
     public static final String VSERVER_VSERVER_NAME = "vserver.vserver-name";
     public static final String GENERIC_VNF_VNF_NAME = "generic-vnf.vnf-name";
     public static final String GENERIC_VNF_VNF_ID = "generic-vnf.vnf-id";
@@ -572,7 +574,7 @@
     protected ControlLoopResponse makeControlLoopResponse(OperationOutcome outcome) {
 
         // only generate response for certain actors.
-        if (outcome == null || !actor.equals("SDNR")) {
+        if (outcome == null || !actor.equals(SdnrActorServiceProvider.NAME)) {
             return null;
         }