From 65defe208374fd0e3688f0653c46aac086241904 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Tue, 7 Feb 2017 16:34:23 +0100 Subject: [PATCH] Ignore feature conditions Features whose name contains "-condition-" encode feature conditions; for example, kar-condition-shell is the shell condition on the kar feature. These features should never be processed by FeatureConfigPusher. Change-Id: Ic2ce2312fb347792d269d43d7bcb5f115905380f Signed-off-by: Stephen Kitt --- .../configpusherfeature/internal/FeatureConfigPusher.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/opendaylight/config/config-persister-feature4-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigPusher.java b/opendaylight/config/config-persister-feature4-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigPusher.java index 50757fb7b9..7f254d5393 100644 --- a/opendaylight/config/config-persister-feature4-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigPusher.java +++ b/opendaylight/config/config-persister-feature4-adapter/src/main/java/org/opendaylight/controller/configpusherfeature/internal/FeatureConfigPusher.java @@ -75,9 +75,12 @@ public class FeatureConfigPusher { private Set pushConfig(final Feature feature) throws Exception { Set configs = new LinkedHashSet<>(); - if(isInstalled(feature)) { + // Ignore feature conditions — these encode conditions on other features and shouldn't be processed here + if (feature.getName().contains("-condition-")) { + LOG.debug("Ignoring conditional feature {}", feature); + } else if (isInstalled(feature)) { // FIXME Workaround for BUG-2836, features service returns null for feature: standard-condition-webconsole_0_0_0, 3.0.1 - if(featuresService.getFeature(feature.getName(), feature.getVersion()) == null) { + if (featuresService.getFeature(feature.getName(), feature.getVersion()) == null) { LOG.debug("Feature: {}, {} is missing from features service. Skipping", feature.getName(), feature.getVersion()); } else { ChildAwareFeatureWrapper wrappedFeature = new ChildAwareFeatureWrapper(feature, featuresService); -- 2.36.6