<artifactId>policy-management</artifactId>
<version>${version.policy.drools-pdp}</version>
<scope>provided</scope>
- <!-- <optional>true</optional> -->
</dependency>
<dependency>
<groupId>org.onap.policy.drools-applications.controlloop.common</groupId>
import java.io.ByteArrayOutputStream;
import java.io.PrintStream;
+import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
// the 'controller.type' property is set to this value
private static final String TDJAM_CONTROLLER_BUILDER_TAG = "tdjam";
+ // topic on which to publish event notifications
+ private static final String POLICY_CL_MGT = "POLICY-CL-MGT";
+
// additional data associated with session
private final String groupId;
private final String artifactId;
cp.getClosedLoopControlName());
}
- logger.debug(new String(bos.toByteArray()));
+ if (logger.isDebugEnabled()) {
+ logger.debug(new String(bos.toByteArray(), StandardCharsets.UTF_8));
+ }
}
/**
// Generate notification
//
try {
- PolicyEngineConstants.getManager().deliver("POLICY-CL-MGT", notification);
+ PolicyEngineConstants.getManager().deliver(POLICY_CL_MGT, notification);
} catch (RuntimeException e) {
logger.warn("{}: {}.{}: event={} exception generating notification",
// we create the ControlLoopEventManager. The ControlLoopEventManager
// will do extra syntax checking as well as check if the closed loop is disabled.
//
- try {
- start();
- } catch (Exception e) {
- eventManagers.remove(requestId, this);
- onsetToEventManager.remove(event, this);
- throw e;
- }
+ start();
notification = makeNotification();
notification.setNotification(ControlLoopNotificationType.ACTIVE);
notification.setPolicyName(params.getPolicyName() + "." + ruleName);
} catch (Exception e) {
logger.warn("{}: {}.{}", clName, params.getPolicyName(), ruleName, e);
+ eventManagers.remove(requestId, this);
+ onsetToEventManager.remove(event, this);
notification = new VirtualControlLoopNotification(event);
notification.setNotification(ControlLoopNotificationType.REJECTED);
notification.setMessage("Exception occurred: " + e.getMessage());
// Generate notification
//
try {
- PolicyEngineConstants.getManager().deliver("POLICY-CL-MGT", notification);
+ PolicyEngineConstants.getManager().deliver(POLICY_CL_MGT, notification);
} catch (RuntimeException e) {
logger.warn("{}: {}.{}: event={} exception generating notification",
//
try {
notification.setPolicyName(getPolicyName() + "." + ruleName);
- PolicyEngineConstants.getManager().deliver("POLICY-CL-MGT", notification);
+ PolicyEngineConstants.getManager().deliver(POLICY_CL_MGT, notification);
} catch (RuntimeException e) {
logger.warn("{}: {}.{}: manager={} exception generating notification",
//
try {
notification.setPolicyName(getPolicyName() + "." + ruleName);
- PolicyEngineConstants.getManager().deliver("POLICY-CL-MGT", notification);
+ PolicyEngineConstants.getManager().deliver(POLICY_CL_MGT, notification);
} catch (RuntimeException e) {
logger.warn("{}: {}.{}: manager={} exception generating notification",
getClosedLoopControlName(), getPolicyName(), ruleName,
List<TopicCoderFilterConfiguration> encoderConfigurations) throws LinkageError {
if (TDJAM_CONTROLLER_BUILDER_TAG.equals(properties.getProperty(PROPERTY_CONTROLLER_TYPE))) {
- return TdjamController.getBuildInProgress();
+ return NonDroolsPolicyController.getBuildInProgress();
}
return null;
}
return buildInProgress.get();
}
+ @Override
protected void initDrools(Properties properties) {
try {
// Register with drools factory
buildInProgress.set(this);
this.droolsController.set(getDroolsFactory().build(properties, sources, sinks));
- buildInProgress.set(null);
+ buildInProgress.remove();
} catch (Exception | LinkageError e) {
logger.error("{}: cannot init-drools", this);
throw new IllegalArgumentException(e);
logger.info("START: {}", this);
synchronized (this) {
- if (this.alive) {
- return true;
- }
this.alive = true;
}
logger.info("STOP: {}", this);
synchronized (this) {
- if (!this.alive) {
- return true;
- }
this.alive = false;
}
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
clp.setClosedLoopControlName(closedLoopControlName);
if (tc != null) {
- assertTrue(tc.addControlLoopParams(clp) != clp);
+ assertNotSame(clp, tc.addControlLoopParams(clp));
}
return clp;
import java.util.List;
import java.util.Properties;
import java.util.function.Function;
+import org.junit.After;
+import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.onap.policy.common.endpoints.event.comm.TopicSink;
//public static boolean loop = true;
private static Properties prop;
+ private NonDroolsPolicyController controller;
+
@BeforeClass
public static void setupClass() throws Exception {
prop = PropertyUtil.getProperties("src/test/resources/config/tdjam-controller.properties");
}
+ /**
+ * Resets the stats and creates the controller.
+ */
+ @Before
+ public void setUp() {
+ DroolsControllerFeatureHandler.resetStats();
+
+ controller = buildController("tdjam");
+ }
+
+ /**
+ * Destroys the controller.
+ */
+ @After
+ public void tearDown() {
+ String name = controller.getName();
+ assertSame(controller, PolicyControllerConstants.getFactory().get(name));
+ PolicyControllerConstants.getFactory().destroy(controller);
+ assertThatIllegalArgumentException().isThrownBy(
+ () -> PolicyControllerConstants.getFactory().get(name));
+ }
+
@Test
public void testState() {
- NonDroolsPolicyController controller = buildController("tdjam");
-
assertEquals("nondrools", controller.getName());
assertEquals("NonDroolsPolicyController", controller.getGroupId());
assertEquals("nondrools", controller.getArtifactId());
assertFalse(controller.isLocked());
// test a few stubbed-off methods
+ assertNull(controller.getContainer());
+ assertThatIllegalStateException().isThrownBy(() -> controller.updateToVersion(null, null, null, null, null));
+
+ controller.lock();
+ assertTrue(controller.isAlive());
+ assertTrue(controller.isLocked());
+
+ controller.stop();
+ assertFalse(controller.isAlive());
+ assertTrue(controller.isLocked());
+
+ controller.unlock();
+ assertFalse(controller.isAlive());
+ assertFalse(controller.isLocked());
+ }
+
+ @Test
+ public void testNames() {
assertTrue(controller.getSessionNames().isEmpty());
assertTrue(controller.getCanonicalSessionNames().isEmpty());
assertTrue(controller.getBaseDomainNames().isEmpty());
+ }
+
+ @Test
+ public void testOffer() {
+ controller.start();
+
assertFalse(controller.offer("topic", "event"));
assertFalse(controller.offer("event"));
assertEquals(0, controller.getRecentSourceEvents().length);
assertEquals(0, controller.getRecentSinkEvents().length);
- assertNull(controller.getContainer());
+ }
+
+ @Test
+ public void testFacts() {
assertThatIllegalArgumentException().isThrownBy(
() -> controller.fetchModelClass("NoSuchClass"));
- assertThatIllegalStateException().isThrownBy(
- () -> controller.updateToVersion(null, null, null, null, null));
assertTrue(controller.factClassNames(null).isEmpty());
assertEquals(0, controller.factCount(null));
assertTrue(controller.facts(null, null, false).isEmpty());
assertTrue(controller.facts("sessionName", String.class).isEmpty());
assertTrue(controller.factQuery(null, null, null, false).isEmpty());
+ }
+
+ @Test
+ public void testDelete() {
assertFalse(controller.delete("sessionName", "fact"));
assertFalse(controller.delete("fact"));
assertFalse(controller.delete("sessionName", String.class));
assertFalse(controller.delete(String.class));
-
- controller.lock();
- assertTrue(controller.isAlive());
- assertTrue(controller.isLocked());
-
- controller.stop();
- assertFalse(controller.isAlive());
- assertTrue(controller.isLocked());
-
- controller.unlock();
- assertFalse(controller.isAlive());
- assertFalse(controller.isLocked());
-
- destroy(controller);
}
@Test
- public void deliverTest() {
- DroolsControllerFeatureHandler.resetStats();
- final NonDroolsPolicyController controller = buildController("tdjam");
-
+ public void testDeliver() {
final TopicSink topicSink = mock(TopicSink.class);
when(topicSink.getTopic()).thenReturn("POLICY-CL-MGT");
when(topicSink.send(any())).thenReturn(false);
assertFalse(signal.apply("nothing in particular"));
assertEquals(1, DroolsControllerFeatureHandler.afterDeliverFalse);
-
- destroy(controller);
}
private NonDroolsPolicyController buildController(String type) {
return (NonDroolsPolicyController) controller;
}
- private void destroy(PolicyController controller) {
- String name = controller.getName();
- assertSame(controller, PolicyControllerConstants.getFactory().get(name));
- PolicyControllerConstants.getFactory().destroy(controller);
- assertThatIllegalArgumentException().isThrownBy(
- () -> PolicyControllerConstants.getFactory().get(name));
- }
-
/* ============================================================ */
/**
* {@link #isActive()} returns {@code false}, indicating that all steps have completed.
*/
public class ControlLoopEventManager2Drools extends ControlLoopEventManager2 {
+ private static final long serialVersionUID = 1L;
+
private final transient WorkingMemory workMem;
private transient FactHandle factHandle;
* @param thrown exception that was generated
* @return {@code null}
*/
- private OperationOutcome handleException(Throwable thrown) {
+ private OperationOutcome handleException(Throwable thrown) { // NOSONAR
+ /*
+ * disabling sonar about returning the same value because we prefer the code to be
+ * structured this way
+ */
+
if (thrown instanceof CancellationException || thrown.getCause() instanceof CancellationException) {
return null;
}
* @param thrown exception that was generated
* @return {@code null}
*/
- private OperationOutcome handleException(Throwable thrown) {
+ private OperationOutcome handleException(Throwable thrown) { // NOSONAR
+ /*
+ * disabling sonar about returning the same value because we prefer the code to be
+ * structured this way
+ */
+
if (thrown instanceof CancellationException || thrown.getCause() instanceof CancellationException) {
return null;
}
import java.util.stream.Collectors;
import lombok.AccessLevel;
import lombok.Getter;
+import lombok.Setter;
import org.awaitility.Awaitility;
import org.junit.Test;
import org.onap.policy.appc.Request;
private static final String APPC_RESTART_OP = "restart";
private static final String APPC_MODIFY_CONFIG_OP = "ModifyConfig";
+ private static final String SDNR_MODIFY_CONFIG_OP = "ModifyConfig";
+ private static final String SNDR_MODIFY_CONFIG_ANR_OP = "ModifyConfigANR";
+
/*
* Canonical Topic Names.
*/
// used to inject and wait for messages
@Getter(AccessLevel.PROTECTED)
+ @Setter(AccessLevel.PROTECTED)
protected static Topics topics;
// used to wait for messages on SINK topics
* Initializes {@link #topics} and {@link #controller}.
*/
public void init() {
- topics = topicMaker.get();
+ setTopics(topicMaker.get());
Map<String, SimpleLock> locks = getLockMap();
if (locks != null) {
*/
@Test
public void testVpciSunnyDayCompliant() {
- sdnrSunnyDay(VPCI_TOSCA_COMPLIANT_POLICY, VPCI_ONSET, VPCI_SDNR_SUCCESS, "ModifyConfig");
+ sdnrSunnyDay(VPCI_TOSCA_COMPLIANT_POLICY, VPCI_ONSET, VPCI_SDNR_SUCCESS, SDNR_MODIFY_CONFIG_OP);
}
// VSONH
*/
@Test
public void testVsonhSunnyDayCompliant() {
- sdnrSunnyDay(VSONH_TOSCA_COMPLIANT_POLICY, VSONH_ONSET, VSONH_SDNR_SUCCESS, "ModifyConfigANR");
+ sdnrSunnyDay(VSONH_TOSCA_COMPLIANT_POLICY, VSONH_ONSET, VSONH_SDNR_SUCCESS, SNDR_MODIFY_CONFIG_ANR_OP);
}
/**
* executed.
*/
@RunWith(NamedRunner.class)
-public class NamedRunnerTest2 {
+public class NamedRunner2Test {
private static int testCount = 0;
Code Review / policy / drools-applications.git / commitdiff