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
     }
 
     /**
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;
         }