From 1e70699a0e388071c09e15e358188e1c76936a39 Mon Sep 17 00:00:00 2001 From: Jim Hahn Date: Fri, 15 Nov 2019 10:58:03 -0500 Subject: Set drools-pdp Pdp Group from the property file Modified drools-pdp to get its Pdp Group from a property file instead of getting it from the PDP-UPDATE or PDP-STATE-CHANGE requests. Modified property files to use envd, per review comment. Issue-ID: POLICY-2232 Change-Id: Ibf024a476b2216074819dda7a66dcbfba811e278 Signed-off-by: Jim Hahn --- .../java/org/onap/policy/drools/lifecycle/LifecycleFsm.java | 10 ++++++---- .../onap/policy/drools/lifecycle/LifecycleStateRunning.java | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) (limited to 'feature-lifecycle/src/main/java/org') 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 5b4bd1ec..27f375d0 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 @@ -68,6 +68,8 @@ import org.slf4j.LoggerFactory; public class LifecycleFsm implements Startable { protected static final String CONFIGURATION_PROPERTIES_NAME = "feature-lifecycle"; + protected static final String GROUP_NAME = "lifecycle.pdp.group"; + protected static final String DEFAULT_PDP_GROUP = "defaultGroup"; protected static final String POLICY_TYPE_VERSION = "1.0.0"; protected static final long DEFAULT_STATUS_TIMER_SECONDS = 120L; protected static final long MIN_STATUS_INTERVAL_SECONDS = 5L; @@ -92,7 +94,7 @@ public class LifecycleFsm implements Startable { protected ScheduledFuture statusTask; @GsonJsonIgnore - protected MessageTypeDispatcher sourceDispatcher = new MessageTypeDispatcher(new String[]{PDP_MESSAGE_NAME}); + protected MessageTypeDispatcher sourceDispatcher = new MessageTypeDispatcher(PDP_MESSAGE_NAME); @GsonJsonIgnore protected PdpStateChangeFeed stateChangeFeed = new PdpStateChangeFeed(PdpStateChange.class, this); @@ -105,7 +107,7 @@ public class LifecycleFsm implements Startable { protected long statusTimerSeconds = DEFAULT_STATUS_TIMER_SECONDS; @Getter - protected String group; + private final String group; @Getter protected String subgroup; @@ -119,6 +121,7 @@ public class LifecycleFsm implements Startable { */ public LifecycleFsm() { this.properties = SystemPersistenceConstants.getManager().getProperties(CONFIGURATION_PROPERTIES_NAME); + this.group = this.properties.getProperty(GROUP_NAME, DEFAULT_PDP_GROUP); } @Override @@ -238,8 +241,7 @@ public class LifecycleFsm implements Startable { return client.send(status); } - protected void setGroupAction(String group, String subgroup) { - this.group = group; + protected void setSubGroupAction(String subgroup) { this.subgroup = subgroup; } diff --git a/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/LifecycleStateRunning.java b/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/LifecycleStateRunning.java index c5ea44b2..78414fe8 100644 --- a/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/LifecycleStateRunning.java +++ b/feature-lifecycle/src/main/java/org/onap/policy/drools/lifecycle/LifecycleStateRunning.java @@ -117,7 +117,7 @@ public abstract class LifecycleStateRunning extends LifecycleStateDefault { return false; } - fsm.setGroupAction(update.getPdpGroup(), update.getPdpSubgroup()); + fsm.setSubGroupAction(update.getPdpSubgroup()); if (!updatePolicies(update.getPolicies())) { fsm.statusAction(response(update.getRequestId(), PdpResponseStatus.FAIL, "cannot process policies")); -- cgit 1.2.3-korg