홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jonathan Hart
Committed by Gerrit Code Review
dbaed99b 1 parent 6ff6ffe4

Proposing to undeprecate the non-device-specific packet request APIs. 

There doesn't seem to be any reason to require users to specify an empty
Optional when they want to request from all devices.

Change-Id: I2394bfa3ed07cae5c5f514dd24faea74409a33f4
Inline Side-by-side
Showing 2 changed files with 20 additions and 26 deletions
......@@ -15,7 +15,6 @@
*/
package org.onosproject.net.packet;
import com.google.common.annotations.Beta;
import org.onosproject.core.ApplicationId;
import org.onosproject.net.DeviceId;
import org.onosproject.net.flow.TrafficSelector;
......@@ -57,7 +56,6 @@ public interface PacketService {
*
* @return list of existing packet processor entries
*/
@Beta
List<PacketProcessorEntry> getProcessors();
/**
......@@ -67,9 +65,7 @@ public interface PacketService {
* @param selector the traffic selector used to match packets
* @param priority the priority of the rule
* @param appId the application ID of the requester
* @deprecated 1.5.0 Falcon Release
*/
@Deprecated
void requestPackets(TrafficSelector selector, PacketPriority priority,
ApplicationId appId);
......@@ -95,9 +91,7 @@ public interface PacketService {
* @param selector the traffic selector used to match packets
* @param priority the priority of the rule
* @param appId the application ID of the requester
* @deprecated 1.5.0 Falcon Release
*/
@Deprecated
void cancelPackets(TrafficSelector selector, PacketPriority priority,
ApplicationId appId);
......
......@@ -17,7 +17,6 @@ package org.onosproject.net.packet.impl;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
......@@ -34,7 +33,6 @@ import org.onosproject.net.device.DeviceEvent;
import org.onosproject.net.device.DeviceListener;
import org.onosproject.net.device.DeviceService;
import org.onosproject.net.flow.DefaultTrafficTreatment;
import org.onosproject.net.flow.FlowRuleService;
import org.onosproject.net.flow.TrafficSelector;
import org.onosproject.net.flowobjective.DefaultForwardingObjective;
import org.onosproject.net.flowobjective.FlowObjectiveService;
......@@ -68,7 +66,9 @@ import java.util.concurrent.Executors;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.onlab.util.Tools.groupedThreads;
import static org.onosproject.security.AppGuard.checkPermission;
import static org.onosproject.security.AppPermission.Type.*;
import static org.onosproject.security.AppPermission.Type.PACKET_EVENT;
import static org.onosproject.security.AppPermission.Type.PACKET_READ;
import static org.onosproject.security.AppPermission.Type.PACKET_WRITE;
import static org.slf4j.LoggerFactory.getLogger;
/**
......@@ -82,9 +82,10 @@ public class PacketManager
private final Logger log = getLogger(getClass());
private static final String TABLE_TYPE_MSG =
"Table Type cannot be null. For requesting packets without " +
"table hints, use other methods in the packetService API";
private static final String ERROR_NULL_PROCESSOR = "Processor cannot be null";
private static final String ERROR_NULL_SELECTOR = "Selector cannot be null";
private static final String ERROR_NULL_APP_ID = "Application ID cannot be null";
private static final String ERROR_NULL_DEVICE_ID = "Device ID cannot be null";
private final PacketStoreDelegate delegate = new InternalStoreDelegate();
......@@ -98,13 +99,10 @@ public class PacketManager
protected DeviceService deviceService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected FlowRuleService flowService;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected PacketStore store;
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
private FlowObjectiveService objectiveService;
protected FlowObjectiveService objectiveService;
private ExecutorService eventHandlingExecutor;
......@@ -146,7 +144,7 @@ public class PacketManager
@Override
public void addProcessor(PacketProcessor processor, int priority) {
checkPermission(PACKET_EVENT);
checkNotNull(processor, "Processor cannot be null");
checkNotNull(processor, ERROR_NULL_PROCESSOR);
ProcessorEntry entry = new ProcessorEntry(processor, priority);
// Insert the new processor according to its priority.
......@@ -162,7 +160,7 @@ public class PacketManager
@Override
public void removeProcessor(PacketProcessor processor) {
checkPermission(PACKET_EVENT);
checkNotNull(processor, "Processor cannot be null");
checkNotNull(processor, ERROR_NULL_PROCESSOR);
// Remove the processor entry.
for (int i = 0; i < processors.size(); i++) {
......@@ -183,8 +181,8 @@ public class PacketManager
public void requestPackets(TrafficSelector selector, PacketPriority priority,
ApplicationId appId) {
checkPermission(PACKET_READ);
checkNotNull(selector, "Selector cannot be null");
checkNotNull(appId, "Application ID cannot be null");
checkNotNull(selector, ERROR_NULL_SELECTOR);
checkNotNull(appId, ERROR_NULL_APP_ID);
PacketRequest request = new DefaultPacketRequest(selector, priority, appId,
localNodeId, Optional.empty());
......@@ -195,8 +193,9 @@ public class PacketManager
public void requestPackets(TrafficSelector selector, PacketPriority priority,
ApplicationId appId, Optional<DeviceId> deviceId) {
checkPermission(PACKET_READ);
checkNotNull(selector, "Selector cannot be null");
checkNotNull(appId, "Application ID cannot be null");
checkNotNull(selector, ERROR_NULL_SELECTOR);
checkNotNull(appId, ERROR_NULL_APP_ID);
checkNotNull(deviceId, ERROR_NULL_DEVICE_ID);
PacketRequest request =
new DefaultPacketRequest(selector, priority, appId,
......@@ -210,8 +209,8 @@ public class PacketManager
public void cancelPackets(TrafficSelector selector, PacketPriority priority,
ApplicationId appId) {
checkPermission(PACKET_READ);
checkNotNull(selector, "Selector cannot be null");
checkNotNull(appId, "Application ID cannot be null");
checkNotNull(selector, ERROR_NULL_SELECTOR);
checkNotNull(appId, ERROR_NULL_APP_ID);
PacketRequest request = new DefaultPacketRequest(selector, priority, appId,
......@@ -223,8 +222,9 @@ public class PacketManager
public void cancelPackets(TrafficSelector selector, PacketPriority priority,
ApplicationId appId, Optional<DeviceId> deviceId) {
checkPermission(PACKET_READ);
checkNotNull(selector, "Selector cannot be null");
checkNotNull(appId, "Application ID cannot be null");
checkNotNull(selector, ERROR_NULL_SELECTOR);
checkNotNull(appId, ERROR_NULL_APP_ID);
checkNotNull(deviceId, ERROR_NULL_DEVICE_ID);
PacketRequest request = new DefaultPacketRequest(selector, priority,
appId, localNodeId,
......