| commit | 9a693fda41e0384c71fb017510a453f0edf090be | [log] [tgz] |
|---|---|---|
| author | tom <tom@onlab.us> | Fri Oct 03 11:32:19 2014 -0700 |
| committer | tom <tom@onlab.us> | Fri Oct 03 11:32:19 2014 -0700 |
| tree | ef15f312fe9d32f312f7ef53d1641955d1690767 | |
| parent | 03fec1f2a80808305b8a76655b4d34ea302ccdac [diff] |
Fixed traffic selector builder to allow only one criterion. Temporarily disabled flow rule time-out.
diff --git a/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/FlowRuleBuilder.java b/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/FlowRuleBuilder.java index eba2282..82fcede 100644 --- a/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/FlowRuleBuilder.java +++ b/providers/openflow/flow/src/main/java/org/onlab/onos/provider/of/flow/impl/FlowRuleBuilder.java
@@ -86,7 +86,7 @@ private TrafficTreatment buildTreatment() { - TrafficTreatment.Builder builder = new DefaultTrafficTreatment.Builder(); + TrafficTreatment.Builder builder = DefaultTrafficTreatment.builder(); // If this is a drop rule if (actions.size() == 0) { builder.drop(); @@ -171,7 +171,7 @@ } private TrafficSelector buildSelector() { - TrafficSelector.Builder builder = new DefaultTrafficSelector.Builder(); + TrafficSelector.Builder builder = DefaultTrafficSelector.builder(); for (MatchField<?> field : match.getMatchFields()) { switch (field.id) { case IN_PORT:
diff --git a/providers/openflow/packet/src/test/java/org/onlab/onos/provider/of/packet/impl/OpenFlowPacketProviderTest.java b/providers/openflow/packet/src/test/java/org/onlab/onos/provider/of/packet/impl/OpenFlowPacketProviderTest.java index 030563c..37971e3 100644 --- a/providers/openflow/packet/src/test/java/org/onlab/onos/provider/of/packet/impl/OpenFlowPacketProviderTest.java +++ b/providers/openflow/packet/src/test/java/org/onlab/onos/provider/of/packet/impl/OpenFlowPacketProviderTest.java
@@ -181,7 +181,7 @@ } private static TrafficTreatment treatment(Instruction ... insts) { - TrafficTreatment.Builder builder = new DefaultTrafficTreatment.Builder(); + TrafficTreatment.Builder builder = DefaultTrafficTreatment.builder(); for (Instruction i : insts) { builder.add(i); }