From 075f1013593666ebb9afffddf06581ca4ff96ddd Mon Sep 17 00:00:00 2001 From: Pier Luigi Date: Thu, 1 Feb 2018 10:23:12 +0100 Subject: [PATCH] Fix SONAR warnings in OFDPA2 pipeline Change-Id: I2162d316398dc5946997d9913a6a509345d06879 --- .../org/onosproject/driver/pipeline/ofdpa/Ofdpa2Pipeline.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2Pipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2Pipeline.java index 383ba4dcc9..ff9f2c087b 100644 --- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2Pipeline.java +++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa2Pipeline.java @@ -100,9 +100,9 @@ import static org.onlab.packet.MacAddress.NONE; import static org.onlab.util.Tools.groupedThreads; import static org.onosproject.driver.pipeline.ofdpa.OfdpaGroupHandlerUtility.*; import static org.onosproject.net.flow.criteria.Criterion.Type.ETH_TYPE; +import static org.onosproject.net.group.GroupDescription.Type.SELECT; import static org.slf4j.LoggerFactory.getLogger; import static org.onosproject.net.flow.criteria.Criterion.Type.MPLS_BOS; -import static org.onosproject.net.flowobjective.NextObjective.Type.HASHED; /** * Driver for Broadcom's OF-DPA v2.0 TTP. @@ -1262,7 +1262,7 @@ public class Ofdpa2Pipeline extends AbstractHandlerBehaviour implements Pipeline List> gkeys = appKryo.deserialize(next.data()); // we only need the top level group's key to point the flow to it Group group = groupService.getGroup(deviceId, gkeys.get(0).peekFirst()); - if (isNotMplsBos(selector) && group.type().equals(HASHED)) { + if (isNotMplsBos(selector) && group.type().equals(SELECT)) { log.warn("SR CONTINUE case cannot be handled as MPLS ECMP " + "is not implemented in OF-DPA yet. Aborting this flow {} -> next:{}" + "in this device {}", fwd.id(), fwd.nextId(), deviceId);