commit b931137eb69d2401dfdb24d73fdb2c61538b20a2
author Marc De Leenheer <marc@onlab.us> Thu Jul 09 11:36:49 2015 -0700
committer Gerrit Code Review <gerrit@onlab.us> Thu Jul 30 16:34:26 2015 +0000
tree bba088a02b6a6bbf853cb9b62bc2c1009b5ee04a
parent 35958237397d6118fa599cbf14f55b17b0978531

Driver and flow stats handling for Calient fiber switch S160.
Bump loxigen to 0.4.1.onos-SNAPSHOT.

Change-Id: Ieb8aa4fe716e12f89b83770eff617561f30cdd08

core/api/src/main/java/org/onosproject/net/Device.java

diff --git a/core/api/src/main/java/org/onosproject/net/Device.java b/core/api/src/main/java/org/onosproject/net/Device.java
index 8066a7a..80e6e48 100644
--- a/core/api/src/main/java/org/onosproject/net/Device.java
+++ b/core/api/src/main/java/org/onosproject/net/Device.java
@@ -26,7 +26,7 @@
      * Coarse classification of the type of the infrastructure device.
      */
     public enum Type {
-        SWITCH, ROUTER, ROADM, OTN, ROADM_OTN, FIREWALL, BALANCER, IPS, IDS, CONTROLLER, VIRTUAL, OTHER
+        SWITCH, ROUTER, ROADM, OTN, ROADM_OTN, FIREWALL, BALANCER, IPS, IDS, CONTROLLER, VIRTUAL, FIBER_SWITCH, OTHER
     }
 
     /**

core/net/src/main/java/org/onosproject/net/packet/impl/PacketManager.java

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 d7ed927..2cd392f 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
@@ -194,8 +194,7 @@
      * @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)) {
+        if (!device.type().equals(Device.Type.SWITCH)) {
             return;
         }
 
@@ -217,8 +216,7 @@
      * @param request the packet request
      */
     private void removeRule(Device device, PacketRequest request) {
-        // Everything is pre-provisioned on ROADMs
-        if (device.type().equals(Device.Type.ROADM)) {
+        if (!device.type().equals(Device.Type.SWITCH)) {
             return;
         }