Fixed traffic selector builder to allow only one criterion.
Temporarily disabled flow rule time-out.
diff --git a/apps/fwd/src/main/java/org/onlab/onos/fwd/ReactiveForwarding.java b/apps/fwd/src/main/java/org/onlab/onos/fwd/ReactiveForwarding.java
index aaf5350..564a2da 100644
--- a/apps/fwd/src/main/java/org/onlab/onos/fwd/ReactiveForwarding.java
+++ b/apps/fwd/src/main/java/org/onlab/onos/fwd/ReactiveForwarding.java
@@ -184,13 +184,13 @@
// Install the flow rule to handle this type of message from now on.
Ethernet inPkt = context.inPacket().parsed();
- TrafficSelector.Builder builder = new DefaultTrafficSelector.Builder();
+ TrafficSelector.Builder builder = DefaultTrafficSelector.builder();
builder.matchEthType(inPkt.getEtherType())
.matchEthSrc(inPkt.getSourceMAC())
.matchEthDst(inPkt.getDestinationMAC())
.matchInport(context.inPacket().receivedFrom().port());
- TrafficTreatment.Builder treat = new DefaultTrafficTreatment.Builder();
+ TrafficTreatment.Builder treat = DefaultTrafficTreatment.builder();
treat.setOutput(portNumber);
FlowRule f = new DefaultFlowRule(context.inPacket().receivedFrom().deviceId(),
diff --git a/cli/src/main/java/org/onlab/onos/cli/net/IntentInstallCommand.java b/cli/src/main/java/org/onlab/onos/cli/net/IntentInstallCommand.java
index 379d6a8..90b7311 100644
--- a/cli/src/main/java/org/onlab/onos/cli/net/IntentInstallCommand.java
+++ b/cli/src/main/java/org/onlab/onos/cli/net/IntentInstallCommand.java
@@ -39,19 +39,15 @@
HostId srcId = HostId.hostId(src);
HostId dstId = HostId.hostId(dst);
- TrafficSelector.Builder builder = new DefaultTrafficSelector.Builder();
- builder
- .matchEthSrc(hosts.getHost(srcId).mac())
- .matchEthDst(hosts.getHost(dstId).mac());
+ TrafficSelector.Builder builder = DefaultTrafficSelector.builder();
+ builder.matchEthSrc(hosts.getHost(srcId).mac())
+ .matchEthDst(hosts.getHost(dstId).mac());
- TrafficTreatment.Builder treat = new DefaultTrafficTreatment.Builder();
+ TrafficTreatment.Builder treat = DefaultTrafficTreatment.builder();
- HostToHostIntent intent = new HostToHostIntent(
- new IntentId(id++),
- srcId,
- dstId,
- builder.build(),
- treat.build());
+ HostToHostIntent intent =
+ new HostToHostIntent(new IntentId(id++), srcId, dstId,
+ builder.build(), treat.build());
log.info("Adding intent {}", intent);
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficSelector.java b/core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficSelector.java
index d792c7e..31c53a8 100644
--- a/core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficSelector.java
+++ b/core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficSelector.java
@@ -1,36 +1,43 @@
package org.onlab.onos.net.flow;
-import static org.slf4j.LoggerFactory.getLogger;
-
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Objects;
-import java.util.Set;
-
+import com.google.common.collect.ImmutableSet;
import org.onlab.onos.net.PortNumber;
import org.onlab.onos.net.flow.criteria.Criteria;
import org.onlab.onos.net.flow.criteria.Criterion;
import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
import org.onlab.packet.VlanId;
-import org.slf4j.Logger;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
+
+/**
+ * Default traffic selector implementation.
+ */
public final class DefaultTrafficSelector implements TrafficSelector {
- private final Set<Criterion> selector;
+ private final Set<Criterion> criteria;
- private DefaultTrafficSelector(Set<Criterion> selector) {
- this.selector = Collections.unmodifiableSet(selector);
+ /**
+ * Creates a new traffic selector with the specified criteria.
+ *
+ * @param criteria criteria
+ */
+ private DefaultTrafficSelector(Set<Criterion> criteria) {
+ this.criteria = Collections.unmodifiableSet(criteria);
}
@Override
public Set<Criterion> criteria() {
- return selector;
+ return criteria;
}
@Override
public int hashCode() {
- return Objects.hash(selector);
+ return Objects.hash(criteria);
}
@Override
@@ -40,23 +47,50 @@
}
if (obj instanceof DefaultTrafficSelector) {
DefaultTrafficSelector that = (DefaultTrafficSelector) obj;
- return Objects.equals(selector, that.selector);
+ return Objects.equals(criteria, that.criteria);
}
return false;
}
+ /**
+ * Returns a new traffic selector builder.
+ *
+ * @return traffic selector builder
+ */
+ public static TrafficSelector.Builder builder() {
+ return new Builder();
+ }
+ /**
+ * Returns a new traffic selector builder primed to produce entities
+ * patterned after the supplied selector.
+ *
+ * @return traffic selector builder
+ */
+ public static TrafficSelector.Builder builder(TrafficSelector selector) {
+ return new Builder(selector);
+ }
- public static class Builder implements TrafficSelector.Builder {
+ /**
+ * Builder of traffic selector entities.
+ */
+ public static final class Builder implements TrafficSelector.Builder {
- private final Logger log = getLogger(getClass());
+ private final Map<Criterion.Type, Criterion> selector = new HashMap<>();
- private final Set<Criterion> selector = new HashSet<>();
+ private Builder() {
+ }
+
+ private Builder(TrafficSelector selector) {
+ for (Criterion c : selector.criteria()) {
+ add(c);
+ }
+ }
@Override
public Builder add(Criterion criterion) {
- selector.add(criterion);
+ selector.put(criterion.type(), criterion);
return this;
}
@@ -107,7 +141,7 @@
@Override
public TrafficSelector build() {
- return new DefaultTrafficSelector(selector);
+ return new DefaultTrafficSelector(ImmutableSet.copyOf(selector.values()));
}
}
diff --git a/core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficTreatment.java b/core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficTreatment.java
index 2ce233f..3f43598 100644
--- a/core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficTreatment.java
+++ b/core/api/src/main/java/org/onlab/onos/net/flow/DefaultTrafficTreatment.java
@@ -1,11 +1,5 @@
package org.onlab.onos.net.flow;
-import static org.slf4j.LoggerFactory.getLogger;
-
-import java.util.Collections;
-import java.util.LinkedList;
-import java.util.List;
-
import org.onlab.onos.net.PortNumber;
import org.onlab.onos.net.flow.instructions.Instruction;
import org.onlab.onos.net.flow.instructions.Instructions;
@@ -14,10 +8,24 @@
import org.onlab.packet.VlanId;
import org.slf4j.Logger;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+/**
+ * Default traffic treatment implementation.
+ */
public final class DefaultTrafficTreatment implements TrafficTreatment {
private final List<Instruction> instructions;
+ /**
+ * Creates a new traffic treatment from the specified list of instructions.
+ *
+ * @param instructions treatment instructions
+ */
private DefaultTrafficTreatment(List<Instruction> instructions) {
this.instructions = Collections.unmodifiableList(instructions);
}
@@ -28,12 +36,19 @@
}
/**
+ * Returns a new traffic treatment builder.
+ *
+ * @return traffic treatment builder
+ */
+ public static TrafficTreatment.Builder builder() {
+ return new Builder();
+ }
+
+ /**
* Builds a list of treatments following the following order.
* Modifications -> Group -> Output (including drop)
- *
*/
-
- public static class Builder implements TrafficTreatment.Builder {
+ public static final class Builder implements TrafficTreatment.Builder {
private final Logger log = getLogger(getClass());
@@ -47,27 +62,31 @@
// TODO: should be a list of instructions based on modification objects
List<Instruction> modifications = new LinkedList<>();
+ // Creates a new builder
+ private Builder() {
+ }
+
public Builder add(Instruction instruction) {
if (drop) {
return this;
}
switch (instruction.type()) {
- case DROP:
- drop = true;
- break;
- case OUTPUT:
- outputs.add(instruction);
- break;
- case L2MODIFICATION:
- case L3MODIFICATION:
- // TODO: enforce modification order if any
- modifications.add(instruction);
- break;
- case GROUP:
- groups.add(instruction);
- break;
- default:
- log.warn("Unknown instruction type {}", instruction.type());
+ case DROP:
+ drop = true;
+ break;
+ case OUTPUT:
+ outputs.add(instruction);
+ break;
+ case L2MODIFICATION:
+ case L3MODIFICATION:
+ // TODO: enforce modification order if any
+ modifications.add(instruction);
+ break;
+ case GROUP:
+ groups.add(instruction);
+ break;
+ default:
+ log.warn("Unknown instruction type {}", instruction.type());
}
return this;
}
diff --git a/core/api/src/main/java/org/onlab/onos/net/packet/DefaultPacketContext.java b/core/api/src/main/java/org/onlab/onos/net/packet/DefaultPacketContext.java
index 6f1b708..75100c6 100644
--- a/core/api/src/main/java/org/onlab/onos/net/packet/DefaultPacketContext.java
+++ b/core/api/src/main/java/org/onlab/onos/net/packet/DefaultPacketContext.java
@@ -24,7 +24,7 @@
this.inPkt = inPkt;
this.outPkt = outPkt;
this.block = new AtomicBoolean(block);
- this.builder = new DefaultTrafficTreatment.Builder();
+ this.builder = DefaultTrafficTreatment.builder();
}
@Override
diff --git a/core/api/src/test/java/org/onlab/onos/net/intent/ConnectivityIntentTest.java b/core/api/src/test/java/org/onlab/onos/net/intent/ConnectivityIntentTest.java
index fb1efee..10a0069 100644
--- a/core/api/src/test/java/org/onlab/onos/net/intent/ConnectivityIntentTest.java
+++ b/core/api/src/test/java/org/onlab/onos/net/intent/ConnectivityIntentTest.java
@@ -16,8 +16,8 @@
public abstract class ConnectivityIntentTest extends IntentTest {
public static final IntentId IID = new IntentId(123);
- public static final TrafficSelector MATCH = (new DefaultTrafficSelector.Builder()).build();
- public static final TrafficTreatment NOP = (new DefaultTrafficTreatment.Builder()).build();
+ public static final TrafficSelector MATCH = DefaultTrafficSelector.builder().build();
+ public static final TrafficTreatment NOP = DefaultTrafficTreatment.builder().build();
public static final ConnectPoint P1 = new ConnectPoint(DeviceId.deviceId("111"), PortNumber.portNumber(0x1));
public static final ConnectPoint P2 = new ConnectPoint(DeviceId.deviceId("222"), PortNumber.portNumber(0x2));
diff --git a/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java b/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
index 00619b3..db82eed 100644
--- a/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
+++ b/core/net/src/main/java/org/onlab/onos/net/flow/impl/FlowRuleManager.java
@@ -242,15 +242,16 @@
}
private boolean checkRuleLiveness(FlowRule swRule, FlowRule storedRule) {
- int timeout = storedRule.timeout();
- if (storedRule.packets() != swRule.packets()) {
- deadRounds.get(swRule).set(0);
- return true;
- }
-
- return (deadRounds.get(swRule).getAndIncrement() *
- FlowRuleProvider.POLL_INTERVAL) <= timeout;
-
+ return true;
+// int timeout = storedRule.timeout();
+// if (storedRule.packets() != swRule.packets()) {
+// deadRounds.get(swRule).set(0);
+// return true;
+// }
+//
+// return (deadRounds.get(swRule).getAndIncrement() *
+// FlowRuleProvider.POLL_INTERVAL) <= timeout;
+//
}
// Posts the specified event to the local event dispatcher.
diff --git a/core/net/src/main/java/org/onlab/onos/net/host/impl/HostMonitor.java b/core/net/src/main/java/org/onlab/onos/net/host/impl/HostMonitor.java
index c9e0442..628f424 100644
--- a/core/net/src/main/java/org/onlab/onos/net/host/impl/HostMonitor.java
+++ b/core/net/src/main/java/org/onlab/onos/net/host/impl/HostMonitor.java
@@ -150,7 +150,7 @@
List<Instruction> instructions = new ArrayList<>();
instructions.add(Instructions.createOutput(port.number()));
- TrafficTreatment treatment = new DefaultTrafficTreatment.Builder()
+ TrafficTreatment treatment = DefaultTrafficTreatment.builder()
.setOutput(port.number())
.build();
diff --git a/core/net/src/main/java/org/onlab/onos/net/intent/impl/PathIntentInstaller.java b/core/net/src/main/java/org/onlab/onos/net/intent/impl/PathIntentInstaller.java
index 524aa6e..6aa9f66 100644
--- a/core/net/src/main/java/org/onlab/onos/net/intent/impl/PathIntentInstaller.java
+++ b/core/net/src/main/java/org/onlab/onos/net/intent/impl/PathIntentInstaller.java
@@ -1,7 +1,5 @@
package org.onlab.onos.net.intent.impl;
-import java.util.Iterator;
-
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
@@ -17,24 +15,25 @@
import org.onlab.onos.net.flow.FlowRuleService;
import org.onlab.onos.net.flow.TrafficSelector;
import org.onlab.onos.net.flow.TrafficTreatment;
-import org.onlab.onos.net.flow.criteria.Criterion;
import org.onlab.onos.net.intent.IntentExtensionService;
import org.onlab.onos.net.intent.IntentInstaller;
import org.onlab.onos.net.intent.PathIntent;
+import java.util.Iterator;
+
/**
- * An intent installer for {@link PathIntent}.
+ * Installer for {@link PathIntent path connectivity intents}.
*/
@Component(immediate = true)
-public class PathIntentInstaller
- implements IntentInstaller<PathIntent> {
+public class PathIntentInstaller implements IntentInstaller<PathIntent> {
+
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected IntentExtensionService intentManager;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
- private FlowRuleService flowRuleService;
+ protected FlowRuleService flowRuleService;
- private final ApplicationId appId = ApplicationId.valueOf(1);
+ private final ApplicationId appId = ApplicationId.getAppId();
@Activate
public void activate() {
@@ -48,24 +47,21 @@
@Override
public void install(PathIntent intent) {
- TrafficSelector.Builder builder = new DefaultTrafficSelector.Builder();
- TrafficSelector selector = intent.getTrafficSelector();
- for (Criterion c : selector.criteria()) {
- builder.add(c);
- }
-
+ TrafficSelector.Builder builder =
+ DefaultTrafficSelector.builder(intent.getTrafficSelector());
Iterator<Link> links = intent.getPath().links().iterator();
ConnectPoint prev = links.next().dst();
while (links.hasNext()) {
builder.matchInport(prev.port());
Link link = links.next();
- TrafficTreatment.Builder treat = new DefaultTrafficTreatment.Builder();
+ TrafficTreatment.Builder treat = DefaultTrafficTreatment.builder();
treat.setOutput(link.src().port());
- FlowRule f = new DefaultFlowRule(link.src().deviceId(),
- builder.build(), treat.build(), 0, appId, 0);
- flowRuleService.applyFlowRules(f);
+ FlowRule rule = new DefaultFlowRule(link.src().deviceId(),
+ builder.build(), treat.build(),
+ 0, appId, 30);
+ flowRuleService.applyFlowRules(rule);
prev = link.dst();
}
diff --git a/core/net/src/main/java/org/onlab/onos/net/proxyarp/impl/ProxyArpManager.java b/core/net/src/main/java/org/onlab/onos/net/proxyarp/impl/ProxyArpManager.java
index 6e07c3e..3570948 100644
--- a/core/net/src/main/java/org/onlab/onos/net/proxyarp/impl/ProxyArpManager.java
+++ b/core/net/src/main/java/org/onlab/onos/net/proxyarp/impl/ProxyArpManager.java
@@ -43,7 +43,6 @@
import com.google.common.collect.Lists;
import com.google.common.collect.Multimap;
-
@Component(immediate = true)
@Service
public class ProxyArpManager implements ProxyArpService {
@@ -128,7 +127,7 @@
Ethernet arpReply = buildArpReply(dst, eth);
// TODO: check send status with host service.
- TrafficTreatment.Builder builder = new DefaultTrafficTreatment.Builder();
+ TrafficTreatment.Builder builder = DefaultTrafficTreatment.builder();
builder.setOutput(src.location().port());
packetService.emit(new DefaultOutboundPacket(src.location().deviceId(),
builder.build(), ByteBuffer.wrap(arpReply.serialize())));
@@ -148,7 +147,7 @@
if (h == null) {
flood(eth);
} else {
- TrafficTreatment.Builder builder = new DefaultTrafficTreatment.Builder();
+ TrafficTreatment.Builder builder = DefaultTrafficTreatment.builder();
builder.setOutput(h.location().port());
packetService.emit(new DefaultOutboundPacket(h.location().deviceId(),
builder.build(), ByteBuffer.wrap(eth.serialize())));
@@ -166,7 +165,7 @@
synchronized (externalPorts) {
for (Entry<Device, PortNumber> entry : externalPorts.entries()) {
- builder = new DefaultTrafficTreatment.Builder();
+ builder = DefaultTrafficTreatment.builder();
builder.setOutput(entry.getValue());
packetService.emit(new DefaultOutboundPacket(entry.getKey().id(),
builder.build(), buf));
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);
}
diff --git a/tools/dev/bash_profile b/tools/dev/bash_profile
index 8332a47..3d80228 100644
--- a/tools/dev/bash_profile
+++ b/tools/dev/bash_profile
@@ -21,7 +21,7 @@
# e.g. 'o api', 'o dev', 'o'
function o {
cd $(find $ONOS_ROOT/ -type d | egrep -v '\.git|target' | \
- egrep "${1:-$ONOS_ROOT}" | head -n 1)
+ egrep "${1:-$ONOS_ROOT}" | egrep -v "$ONOS_ROOT/.+/src/" | head -n 1)
}
# Short-hand for 'mvn clean install' for us lazy folk