| commit | 8b3e80b14e04501985ba303ce515168dbb05337f | [log] [tgz] |
|---|---|---|
| author | Marc De Leenheer <marc@onlab.us> | Fri Mar 06 14:27:03 2015 -0800 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Tue Mar 10 05:14:50 2015 +0000 |
| tree | 352730337dd2c94092ba3ee0596e63c876a0f30e | |
| parent | e106e4b7c7b4ee8a231dddd9435a58c3e5aecf40 [diff] [blame] |
Remove default flow rules for ROADMs. Fix LinkResource NPE. Single instance provisions optical path. Change-Id: Iacbd41403ecd0c0df240d09026253c4b761a1d6a
diff --git a/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java b/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java index 18989bb..8908601 100644 --- a/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java +++ b/core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java
@@ -220,6 +220,11 @@ * @param request the packet request */ private void pushRule(Device device, PacketRequest request) { + // Everything is pre-provisioned on ROADMs + if (device.type().equals(Device.Type.ROADM)) { + return; + } + TrafficTreatment treatment = DefaultTrafficTreatment.builder() .punt() .build();