commit 089bb77bd2440df8f8dad131c285f35e9d44fa9f
author alshabib <alshabibi.ali@gmail.com> Tue Mar 03 18:26:26 2015 -0800
committer Gerrit Code Review <gerrit@onlab.us> Thu Mar 05 01:11:39 2015 +0000
tree 87bcdb7e7394151c405c391ac8c622b7b231ce4f
parent fbe25c5f7235cd13570e0da1fe3ed92e8cf93f67

partial fix for default flows. Need to redesign packet requests

Change-Id: Ia68412c3843ecd7da3e7ae9f4f52750874fb1409

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 1bc918c..18989bb 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
@@ -15,14 +15,6 @@
  */
 package org.onosproject.net.packet.impl;
 
-import static com.google.common.base.Preconditions.checkNotNull;
-import static org.slf4j.LoggerFactory.getLogger;
-
-import java.util.Collections;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.ConcurrentHashMap;
-
 import org.apache.felix.scr.annotations.Activate;
 import org.apache.felix.scr.annotations.Component;
 import org.apache.felix.scr.annotations.Deactivate;
@@ -31,6 +23,7 @@
 import org.apache.felix.scr.annotations.Service;
 import org.onosproject.core.ApplicationId;
 import org.onosproject.net.Device;
+import org.onosproject.net.MastershipRole;
 import org.onosproject.net.device.DeviceEvent;
 import org.onosproject.net.device.DeviceListener;
 import org.onosproject.net.device.DeviceService;
@@ -55,6 +48,14 @@
 import org.onosproject.net.provider.AbstractProviderService;
 import org.slf4j.Logger;
 
+import java.util.Collections;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.slf4j.LoggerFactory.getLogger;
+
 /**
  * Provides a basic implementation of the packet SB & NB APIs.
  */
@@ -193,8 +194,9 @@
         PacketRequest request =
                 new PacketRequest(selector, priority, appId, tableType);
 
-        packetRequests.add(request);
-        pushToAllDevices(request);
+        if (packetRequests.add(request)) {
+            pushToAllDevices(request);
+        }
     }
 
     /**
@@ -204,7 +206,9 @@
      */
     private void pushToAllDevices(PacketRequest request) {
         for (Device device : deviceService.getDevices()) {
-            pushRule(device, request);
+            if (deviceService.getRole(device.id()) == MastershipRole.MASTER) {
+                pushRule(device, request);
+            }
         }
     }