[FALCON] adding api to enable packet requests to a single device.
Change-Id: Id870c13ece658fe61f46194c1e795fb1d209a6a8
diff --git a/core/api/src/test/java/org/onosproject/net/packet/DefaultPacketRequestTest.java b/core/api/src/test/java/org/onosproject/net/packet/DefaultPacketRequestTest.java
index a7d07e8..9b4df54 100644
--- a/core/api/src/test/java/org/onosproject/net/packet/DefaultPacketRequestTest.java
+++ b/core/api/src/test/java/org/onosproject/net/packet/DefaultPacketRequestTest.java
@@ -24,6 +24,8 @@
import com.google.common.testing.EqualsTester;
+import java.util.Optional;
+
import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.is;
import static org.onlab.junit.ImmutableClassChecker.assertThatClassIsImmutable;
@@ -42,27 +44,27 @@
new DefaultPacketRequest(DefaultTrafficSelector.emptySelector(),
PacketPriority.CONTROL,
NetTestTools.APP_ID,
- NetTestTools.NODE_ID);
+ NetTestTools.NODE_ID, Optional.empty());
private final DefaultPacketRequest sameAsacketRequest1 =
new DefaultPacketRequest(DefaultTrafficSelector.emptySelector(),
PacketPriority.CONTROL,
NetTestTools.APP_ID,
- NetTestTools.NODE_ID);
+ NetTestTools.NODE_ID, Optional.empty());
private final DefaultPacketRequest packetRequest2 =
new DefaultPacketRequest(selector,
PacketPriority.CONTROL,
NetTestTools.APP_ID,
- NetTestTools.NODE_ID);
+ NetTestTools.NODE_ID, Optional.empty());
private final DefaultPacketRequest packetRequest3 =
new DefaultPacketRequest(DefaultTrafficSelector.emptySelector(),
PacketPriority.REACTIVE,
NetTestTools.APP_ID,
- NetTestTools.NODE_ID);
+ NetTestTools.NODE_ID, Optional.empty());
private final DefaultPacketRequest packetRequest4 =
new DefaultPacketRequest(DefaultTrafficSelector.emptySelector(),
PacketPriority.CONTROL,
new DefaultApplicationId(1, "foo"),
- new NodeId("node1"));
+ new NodeId("node1"), Optional.empty());
/**
* Tests the operation of the equals(), toAstring() and hashCode() methods.
diff --git a/core/api/src/test/java/org/onosproject/net/packet/PacketServiceAdapter.java b/core/api/src/test/java/org/onosproject/net/packet/PacketServiceAdapter.java
index 2993ce6..c01dcc0 100644
--- a/core/api/src/test/java/org/onosproject/net/packet/PacketServiceAdapter.java
+++ b/core/api/src/test/java/org/onosproject/net/packet/PacketServiceAdapter.java
@@ -16,9 +16,11 @@
package org.onosproject.net.packet;
import org.onosproject.core.ApplicationId;
+import org.onosproject.net.DeviceId;
import org.onosproject.net.flow.TrafficSelector;
import java.util.List;
+import java.util.Optional;
/**
* Test adapter for packet service.
@@ -43,11 +45,25 @@
}
@Override
- public void requestPackets(TrafficSelector selector, PacketPriority priority, ApplicationId appId) {
+ public void requestPackets(TrafficSelector selector, PacketPriority priority,
+ ApplicationId appId) {
}
@Override
- public void cancelPackets(TrafficSelector selector, PacketPriority priority, ApplicationId appId) {
+ public void requestPackets(TrafficSelector selector, PacketPriority priority,
+ ApplicationId appId, Optional<DeviceId> deviceId) {
+
+ }
+
+ @Override
+ public void cancelPackets(TrafficSelector selector, PacketPriority priority,
+ ApplicationId appId) {
+ }
+
+ @Override
+ public void cancelPackets(TrafficSelector selector, PacketPriority priority,
+ ApplicationId appId, Optional<DeviceId> deviceId) {
+
}
@Override