From 40a1f22ff8d28e78b6512c0a10d454b37f015fdb Mon Sep 17 00:00:00 2001 From: "a.sreekumar" Date: Tue, 5 Nov 2019 14:37:09 +0000 Subject: Retaining context in APEX Engine based on policies received in PdpUpdate Change-Id: I73fad5bf76ed6b4979f5ab76013f204ea82da30b Issue-ID: POLICY-2215 Signed-off-by: a.sreekumar --- .../examples/adaptive/AnomalyDetectionTslUseCaseTest.java | 14 +++++++------- .../apex/examples/adaptive/AutoLearnTslUseCaseTest.java | 5 +++-- 2 files changed, 10 insertions(+), 9 deletions(-) (limited to 'examples/examples-adaptive') diff --git a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionTslUseCaseTest.java b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionTslUseCaseTest.java index 40df82cdb..7ada6a795 100644 --- a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionTslUseCaseTest.java +++ b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AnomalyDetectionTslUseCaseTest.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -26,7 +27,6 @@ import static org.junit.Assert.assertTrue; import java.io.IOException; import java.util.Random; - import org.junit.After; import org.junit.Before; import org.junit.Test; @@ -73,12 +73,12 @@ public class AnomalyDetectionTslUseCaseTest { @Before public void beforeTest() { schemaParameters = new SchemaParameters(); - + schemaParameters.setName(ContextParameterConstants.SCHEMA_GROUP_NAME); schemaParameters.getSchemaHelperParameterMap().put("JAVA", new JavaSchemaHelperParameters()); ParameterService.register(schemaParameters); - + contextParameters = new ContextParameters(); contextParameters.setName(ContextParameterConstants.MAIN_GROUP_NAME); @@ -90,7 +90,7 @@ public class AnomalyDetectionTslUseCaseTest { ParameterService.register(contextParameters.getDistributorParameters()); ParameterService.register(contextParameters.getLockManagerParameters()); ParameterService.register(contextParameters.getPersistorParameters()); - + engineParameters = new EngineParameters(); engineParameters.getExecutorParameterMap().put("MVEL", new MvelExecutorParameters()); engineParameters.getExecutorParameterMap().put("JAVA", new JavaExecutorParameters()); @@ -103,7 +103,7 @@ public class AnomalyDetectionTslUseCaseTest { @After public void afterTest() { ParameterService.deregister(engineParameters); - + ParameterService.deregister(contextParameters.getDistributorParameters()); ParameterService.deregister(contextParameters.getLockManagerParameters()); ParameterService.deregister(contextParameters.getPersistorParameters()); @@ -135,7 +135,7 @@ public class AnomalyDetectionTslUseCaseTest { final TestApexActionListener listener1 = new TestApexActionListener("TestListener1"); apexEngine1.addEventListener("listener", listener1); - apexEngine1.updateModel(apexPolicyModel); + apexEngine1.updateModel(apexPolicyModel, false); apexEngine1.start(); final EnEvent triggerEvent = apexEngine1.createEvent(new AxArtifactKey("AnomalyDetectionTriggerEvent", "0.0.1")); @@ -191,7 +191,7 @@ public class AnomalyDetectionTslUseCaseTest { final TestApexActionListener listener1 = new TestApexActionListener("TestListener1"); apexEngine1.addEventListener("listener1", listener1); - apexEngine1.updateModel(apexPolicyModel); + apexEngine1.updateModel(apexPolicyModel, false); apexEngine1.start(); final EnEvent triggerEvent = diff --git a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnTslUseCaseTest.java b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnTslUseCaseTest.java index bf6c08f16..d40dcc672 100644 --- a/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnTslUseCaseTest.java +++ b/examples/examples-adaptive/src/test/java/org/onap/policy/apex/examples/adaptive/AutoLearnTslUseCaseTest.java @@ -1,6 +1,7 @@ /*- * ============LICENSE_START======================================================= * Copyright (C) 2016-2018 Ericsson. All rights reserved. + * Modifications Copyright (C) 2019 Nordix Foundation. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -134,7 +135,7 @@ public class AutoLearnTslUseCaseTest { final TestApexActionListener listener1 = new TestApexActionListener("TestListener1"); apexEngine1.addEventListener("listener", listener1); - apexEngine1.updateModel(apexPolicyModel); + apexEngine1.updateModel(apexPolicyModel, false); apexEngine1.start(); final EnEvent triggerEvent = apexEngine1.createEvent(new AxArtifactKey("AutoLearnTriggerEvent", "0.0.1")); final double rval = rand.nextGaussian(); @@ -189,7 +190,7 @@ public class AutoLearnTslUseCaseTest { final TestApexActionListener listener1 = new TestApexActionListener("TestListener1"); apexEngine1.addEventListener("listener1", listener1); - apexEngine1.updateModel(apexPolicyModel); + apexEngine1.updateModel(apexPolicyModel, false); apexEngine1.start(); final EnEvent triggerEvent = apexEngine1.createEvent(new AxArtifactKey("AutoLearnTriggerEvent", "0.0.1")); -- cgit 1.2.3-korg