commit ae6284cf3f7f1584043c2943a8ce5fbfab4ff466
author Andrea Campanella <andrea@opennetworking.org> Thu Jul 09 11:39:08 2020 +0200
committer Andrea Campanella <andrea@opennetworking.org> Fri Jul 10 11:59:44 2020 +0200
tree e34f113b5196c5cef89d7cdb3afd8427c586bb58
parent ac96e5bd21df90c689724421439c600927c6ba18

[VOL-3327] Avoid logging of non-error in OLT Pipeliner

Change-Id: Ie56ee6cb206019a113c49253235aebffe40dab91

drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java

diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java
index 2ef01d2..7ca35f0 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/OltPipeline.java
@@ -88,6 +88,7 @@
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
+import static org.onosproject.core.CoreService.CORE_APP_NAME;
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**
@@ -481,7 +482,12 @@
         Criterion innerVlan = selector.getCriterion(Criterion.Type.INNER_VLAN_VID);
 
         if (inport == null || output == null || innerVlan == null || outerVlan == null) {
-            log.error("Forwarding objective is underspecified: {}", fwd);
+            // Avoid logging a non-error from lldp, bbdp and eapol core flows.
+            if (!fwd.appId().name().equals(CORE_APP_NAME)) {
+                log.error("Forwarding objective is underspecified: {}", fwd);
+            } else {
+                log.debug("Not installing unsupported core generated flow {}", fwd);
+            }
             fail(fwd, ObjectiveError.BADPARAMS);
             return;
         }
@@ -514,7 +520,12 @@
         Criterion dstMac = selector.getCriterion(Criterion.Type.ETH_DST);
 
         if (outerVlan == null || innerVlanCriterion == null || inport == null) {
-            log.error("Forwarding objective is underspecified: {}", fwd);
+            // Avoid logging a non-error from lldp, bbdp and eapol core flows.
+            if (!fwd.appId().name().equals(CORE_APP_NAME)) {
+                log.error("Forwarding objective is underspecified: {}", fwd);
+            } else {
+                log.debug("Not installing unsupported core generated flow {}", fwd);
+            }
             fail(fwd, ObjectiveError.BADPARAMS);
             return;
         }