Remove pipeline limitations to OFDPA 3 QMX driver
These features should be supported in OFDPA 3.0 EA5
Change-Id: I4cc720d102dd694b47f2dbd6cb78e3b242af9945
diff --git a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa3QmxPipeline.java b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa3QmxPipeline.java
index cc7c23d..4c6664b 100644
--- a/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa3QmxPipeline.java
+++ b/drivers/default/src/main/java/org/onosproject/driver/pipeline/ofdpa/Ofdpa3QmxPipeline.java
@@ -18,19 +18,8 @@
import static org.slf4j.LoggerFactory.getLogger;
-import java.util.Collection;
-import org.onlab.packet.Ethernet;
-import org.onosproject.net.flow.FlowRule;
-import org.onosproject.net.flow.TrafficSelector;
-import org.onosproject.net.flow.criteria.Criterion;
-import org.onosproject.net.flow.criteria.EthTypeCriterion;
-import org.onosproject.net.flow.criteria.IPCriterion;
-import org.onosproject.net.flowobjective.ForwardingObjective;
-import org.onosproject.net.flowobjective.ObjectiveError;
import org.slf4j.Logger;
-import com.google.common.collect.ImmutableSet;
-
/**
* Pipeliner for Broadcom OF-DPA 3.0 TTP, specifically for Qumran based switches.
*/
@@ -47,50 +36,4 @@
protected boolean matchInPortTmacTable() {
return false;
}
-
- @Override
- protected Collection<FlowRule> processEthTypeSpecific(ForwardingObjective fwd) {
- TrafficSelector selector = fwd.selector();
- EthTypeCriterion ethType =
- (EthTypeCriterion) selector.getCriterion(Criterion.Type.ETH_TYPE);
- //XXX remove when support is added to Qumran based OF-DPA
- if (ethType.ethType().toShort() == Ethernet.TYPE_IPV4 ||
- ethType.ethType().toShort() == Ethernet.TYPE_IPV6) {
- log.warn("Routing table is currently unsupported in dev:{}", deviceId);
- return ImmutableSet.of();
- }
-
- return super.processEthTypeSpecific(fwd);
- }
-
- @Override
- protected Collection<FlowRule> processVersatile(ForwardingObjective fwd) {
- EthTypeCriterion ethType =
- (EthTypeCriterion) fwd.selector().getCriterion(Criterion.Type.ETH_TYPE);
- if (ethType == null) {
- log.error("Versatile forwarding objective:{} must include ethType",
- fwd.id());
- fail(fwd, ObjectiveError.BADPARAMS);
- return ImmutableSet.of();
- }
- //XXX remove when support is added to Qumran based OF-DPA
- if (ethType.ethType().toShort() == Ethernet.TYPE_IPV6) {
- log.warn("ACL table for IPv6 is currently unsupported in dev:{}", deviceId);
- return ImmutableSet.of();
- }
-
- if (ethType.ethType().toShort() == Ethernet.TYPE_IPV4) {
- for (Criterion c : fwd.selector().criteria()) {
- if (c instanceof IPCriterion) {
- if (((IPCriterion) c).type() == Criterion.Type.IPV4_DST) {
- log.warn("ACL table for Dst IPv4 is currently "
- + "unsupported in dev:{}", deviceId);
- return ImmutableSet.of();
- }
- }
- }
- }
-
- return super.processVersatile(fwd);
- }
}