summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRam Krishna Verma <ram_krishna.verma@bell.ca>2021-02-22 19:19:09 +0000
committerGerrit Code Review <gerrit@onap.org>2021-02-22 19:19:09 +0000
commitde864c69085f155c2861990d1647295f5432ae8b (patch)
tree5c1176348c9cbca252971a8b54b225c19f059eb5
parentd6d322e8ce345677c9c60e77253ddbcb86c1d096 (diff)
parent0b54008e634faf5a111ea61ea94c1e4f9ae2a347 (diff)
Merge "support policy execution counts in lifecycle"
-rw-r--r--feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/LifecycleFsm.java2
-rw-r--r--feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleFsmTest.java28
2 files changed, 28 insertions, 2 deletions
diff --git a/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/LifecycleFsm.java b/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/LifecycleFsm.java
index be45d1c9..4f1a4f31 100644
--- a/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/LifecycleFsm.java
+++ b/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/LifecycleFsm.java
@@ -600,7 +600,7 @@ public class LifecycleFsm implements Startable {
updateStats.setTimeStamp(Instant.now());
try {
- BeanUtils.copyProperties(updateStats, PolicyEngineConstants.getManager().getStats());
+ BeanUtils.copyProperties(updateStats, PolicyEngineConstants.getManager().getStats().getGroupStat());
} catch (IllegalAccessException | InvocationTargetException ex) {
logger.debug("statistics mapping failure", ex);
}
diff --git a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleFsmTest.java b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleFsmTest.java
index 54e32d3a..9d36f2ed 100644
--- a/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleFsmTest.java
+++ b/feature-lifecycle/src/test/java/org/onap/policy/drools/lifecycle/LifecycleFsmTest.java
@@ -30,6 +30,7 @@ import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.concurrent.ScheduledExecutorService;
+import org.junit.AfterClass;
import org.junit.Before;
import org.junit.Test;
import org.onap.policy.common.utils.coder.CoderException;
@@ -39,6 +40,7 @@ import org.onap.policy.common.utils.resources.ResourceUtils;
import org.onap.policy.common.utils.time.PseudoScheduledExecutorService;
import org.onap.policy.common.utils.time.TestTimeMulti;
import org.onap.policy.drools.persistence.SystemPersistenceConstants;
+import org.onap.policy.drools.system.PolicyEngineConstants;
import org.onap.policy.drools.utils.logging.LoggerUtil;
import org.onap.policy.models.pdp.concepts.PdpStatus;
import org.onap.policy.models.pdp.enums.PdpState;
@@ -98,7 +100,7 @@ public class LifecycleFsmTest {
* Test initialization.
*/
@Before
- public void init() throws CoderException, IOException {
+ public void beforeTest() throws CoderException, IOException {
LoggerUtil.setLevel(LoggerUtil.ROOT_LOGGER, "INFO");
LoggerUtil.setLevel("org.onap.policy.common.endpoints", "WARN");
LoggerUtil.setLevel("org.onap.policy.drools", "INFO");
@@ -123,6 +125,26 @@ public class LifecycleFsmTest {
getPolicyFromFile(EXAMPLE_OTHER_VAL_POLICY_JSON, EXAMPLE_OTHER_VAL_POLICY_NAME);
unvalPolicy =
getPolicyFromFile(EXAMPLE_OTHER_UNVAL_POLICY_JSON, EXAMPLE_OTHER_UNVAL_POLICY_NAME);
+
+ fsm.resetDeployCountsAction();
+ resetExecutionStats();
+ }
+
+ @AfterClass
+ public static void afterClass() {
+ resetExecutionStats();
+ }
+
+ private static void resetExecutionStats() {
+ PolicyEngineConstants.getManager().getStats().getGroupStat().setPolicyExecutedCount(0L);
+ PolicyEngineConstants.getManager().getStats().getGroupStat().setPolicyExecutedFailCount(0L);
+ PolicyEngineConstants.getManager().getStats().getGroupStat().setPolicyExecutedSuccessCount(0L);
+ }
+
+ private void setExecutionCounts() {
+ PolicyEngineConstants.getManager().getStats().getGroupStat().setPolicyExecutedCount(7L);
+ PolicyEngineConstants.getManager().getStats().getGroupStat().setPolicyExecutedFailCount(2L);
+ PolicyEngineConstants.getManager().getStats().getGroupStat().setPolicyExecutedSuccessCount(5L);
}
@Test
@@ -204,6 +226,7 @@ public class LifecycleFsmTest {
@Test
public void testStatusPayload() {
+ setExecutionCounts();
fsm.updateDeployCountsAction(8L, 6L, 2L);
PdpStatus status = fsm.statusPayload(PdpState.ACTIVE);
@@ -214,6 +237,9 @@ public class LifecycleFsmTest {
assertEquals(2, status.getStatistics().getPolicyDeployFailCount());
assertEquals(8, status.getStatistics().getPolicyDeployCount());
assertNotNull(status.getStatistics().getTimeStamp());
+ assertEquals(7, status.getStatistics().getPolicyExecutedCount());
+ assertEquals(2, status.getStatistics().getPolicyExecutedFailCount());
+ assertEquals(5, status.getStatistics().getPolicyExecutedSuccessCount());
}
protected void deployAllPolicies() {