mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-23 21:31:00 +02:00
Code Issues Projects Releases Wiki Activity

partial fix for default flows. Need to redesign packet requests

Browse Source 
Change-Id: Ia68412c3843ecd7da3e7ae9f4f52750874fb1409
This commit is contained in:
alshabib 2015-03-03 18:26:26 -08:00 committed by Gerrit Code Review
parent fbe25c5f72
commit 089bb77bd2
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,14 +15,6 @@
*/ */
package org.onosproject.net.packet.impl; 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.Activate;
import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate; import org.apache.felix.scr.annotations.Deactivate;
@ -31,6 +23,7 @@ import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service; import org.apache.felix.scr.annotations.Service;
import org.onosproject.core.ApplicationId; import org.onosproject.core.ApplicationId;
import org.onosproject.net.Device; import org.onosproject.net.Device;
import org.onosproject.net.MastershipRole;
import org.onosproject.net.device.DeviceEvent; import org.onosproject.net.device.DeviceEvent;
import org.onosproject.net.device.DeviceListener; import org.onosproject.net.device.DeviceListener;
import org.onosproject.net.device.DeviceService; import org.onosproject.net.device.DeviceService;
@ -55,6 +48,14 @@ import org.onosproject.net.provider.AbstractProviderRegistry;
import org.onosproject.net.provider.AbstractProviderService; import org.onosproject.net.provider.AbstractProviderService;
import org.slf4j.Logger; 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. * Provides a basic implementation of the packet SB & NB APIs.
*/ */
@ -193,8 +194,9 @@ implements PacketService, PacketProviderRegistry {
PacketRequest request = PacketRequest request =
new PacketRequest(selector, priority, appId, tableType); new PacketRequest(selector, priority, appId, tableType);
packetRequests.add(request); if (packetRequests.add(request)) {
pushToAllDevices(request); pushToAllDevices(request);
}
} }
/** /**
@ -204,7 +206,9 @@ implements PacketService, PacketProviderRegistry {
*/ */
private void pushToAllDevices(PacketRequest request) { private void pushToAllDevices(PacketRequest request) {
for (Device device : deviceService.getDevices()) { for (Device device : deviceService.getDevices()) {
pushRule(device, request); if (deviceService.getRole(device.id()) == MastershipRole.MASTER) {
pushRule(device, request);
}
} }
} }