diff options
Diffstat (limited to 'controlloop/common/eventmanager/src')
2 files changed, 30 insertions, 3 deletions
diff --git a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java index 12128554f..248a41be6 100644 --- a/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java +++ b/controlloop/common/eventmanager/src/main/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManager.java @@ -41,6 +41,7 @@ import org.onap.policy.controlloop.actorserviceprovider.ActorService; import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome; import org.onap.policy.controlloop.drl.legacy.ControlLoopParams; import org.onap.policy.controlloop.ophistory.OperationHistoryDataManager; +import org.onap.policy.controlloop.ophistory.OperationHistoryDataManagerStub; import org.onap.policy.controlloop.processor.ControlLoopProcessor; import org.onap.policy.drools.core.lock.LockCallback; import org.onap.policy.drools.system.PolicyEngineConstants; @@ -59,6 +60,12 @@ public class ControlLoopEventManager implements StepContext, Serializable { private static final Logger logger = LoggerFactory.getLogger(ControlLoopEventManager.class); private static final long serialVersionUID = -1216568161322872641L; + /** + * Data manager used when the policy engine's guard.disabled property is "true". + */ + private static final OperationHistoryDataManager STUB_DATA_MANAGER = new OperationHistoryDataManagerStub(); + + private static final String GUARD_DISABLED_PROPERTY = "guard.disabled"; private static final String EVENT_MANAGER_SERVICE_CONFIG = "event-manager"; /** @@ -269,8 +276,6 @@ public class ControlLoopEventManager implements StepContext, Serializable { private static final ActorService ACTOR_SERVICE; static { - // TODO how to dynamically change data manager, depending whether or not - // guards are enabled? EventManagerServices services = new EventManagerServices(EVENT_MANAGER_SERVICE_CONFIG); ACTOR_SERVICE = services.getActorService(); DATA_MANAGER = services.getDataManager(); @@ -296,6 +301,11 @@ public class ControlLoopEventManager implements StepContext, Serializable { } public OperationHistoryDataManager getDataManager() { - return LazyInitData.DATA_MANAGER; + boolean guardDisabled = "true".equalsIgnoreCase(getEnvironmentProperty(GUARD_DISABLED_PROPERTY)); + return (guardDisabled ? STUB_DATA_MANAGER : LazyInitData.DATA_MANAGER); + } + + protected String getEnvironmentProperty(String propName) { + return PolicyEngineConstants.getManager().getEnvironmentProperty(propName); } } diff --git a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java index e4c233281..a8632642a 100644 --- a/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java +++ b/controlloop/common/eventmanager/src/test/java/org/onap/policy/controlloop/eventmanager/ControlLoopEventManagerTest.java @@ -49,6 +49,7 @@ import org.onap.policy.controlloop.ControlLoopException; import org.onap.policy.controlloop.actorserviceprovider.OperationOutcome; import org.onap.policy.controlloop.actorserviceprovider.OperationResult; import org.onap.policy.controlloop.drl.legacy.ControlLoopParams; +import org.onap.policy.controlloop.ophistory.OperationHistoryDataManagerStub; import org.onap.policy.drools.core.lock.LockCallback; import org.onap.policy.drools.core.lock.LockImpl; import org.onap.policy.drools.core.lock.LockState; @@ -241,6 +242,22 @@ public class ControlLoopEventManagerTest { assertFalse(mgr.contains(MY_KEY)); } + /** + * Tests getDataManager() when guard.disabled=true. + */ + @Test + public void testGetDataManagerDisabled() throws ControlLoopException { + mgr = new MyManager(params, REQ_ID) { + private static final long serialVersionUID = 1L; + @Override + protected String getEnvironmentProperty(String propName) { + return ("guard.disabled".equals(propName) ? "true" : null); + } + }; + + assertThat(mgr.getDataManager()).isInstanceOf(OperationHistoryDataManagerStub.class); + } + @Test public void testToString() { assertNotNull(mgr.toString()); |