commit 6fd1ca95aa7a383acde3491a265fc23bb557b65c
author Pier Luigi Ventre <pierluigi.ventre@cnit.it> Fri Jan 13 03:15:50 2017 +0000
committer Jonathan Hart <jono@onlab.us> Mon Jan 16 17:02:01 2017 +0000
tree cb75d06ea72d1f4d13ee190e70f80d1a6e49a593
parent 9e5c5ca22536ccadffaf9280f80c1ed5e6a97565

Revert "Allows duplicating packets when requesting packet-in via PacketService"
and makes wipeDeferred as default.

This reverts commit 874900ec363da57928d6f087527e6e9cbfbc0645.

Change-Id: I080ece4f2f316a95c36bdd09f91c0482fbe6f8d9

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 1fe10a5..cb52c94 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
@@ -181,19 +181,12 @@
     @Override
     public void requestPackets(TrafficSelector selector, PacketPriority priority,
                                ApplicationId appId) {
-        this.requestPackets(selector, priority, appId, false);
-    }
-
-    @Override
-    public void requestPackets(TrafficSelector selector, PacketPriority priority,
-                               ApplicationId appId, boolean copy) {
         checkPermission(PACKET_READ);
         checkNotNull(selector, ERROR_NULL_SELECTOR);
         checkNotNull(appId, ERROR_NULL_APP_ID);
 
         PacketRequest request = new DefaultPacketRequest(selector, priority, appId,
-                localNodeId, Optional.empty(), copy);
-
+                                                         localNodeId, Optional.empty());
         store.requestPackets(request);
     }
 
@@ -210,23 +203,19 @@
                                          localNodeId, deviceId);
 
         store.requestPackets(request);
+
     }
 
     @Override
     public void cancelPackets(TrafficSelector selector, PacketPriority priority,
                               ApplicationId appId) {
-        this.cancelPackets(selector, priority, appId, false);
-    }
-
-    @Override
-    public void cancelPackets(TrafficSelector selector, PacketPriority priority,
-                              ApplicationId appId, boolean copy) {
         checkPermission(PACKET_READ);
         checkNotNull(selector, ERROR_NULL_SELECTOR);
         checkNotNull(appId, ERROR_NULL_APP_ID);
 
+
         PacketRequest request = new DefaultPacketRequest(selector, priority, appId,
-                localNodeId, Optional.empty(), copy);
+                                                         localNodeId, Optional.empty());
         store.cancelPackets(request);
     }
 
@@ -333,18 +322,17 @@
     }
 
     private DefaultForwardingObjective.Builder createBuilder(PacketRequest request) {
-        TrafficTreatment.Builder tBuilder = DefaultTrafficTreatment.builder();
-        tBuilder.punt();
-        if (!request.copy()) {
-            tBuilder.wipeDeferred();
-        }
+        TrafficTreatment treatment = DefaultTrafficTreatment.builder()
+                .punt()
+                .wipeDeferred()
+                .build();
 
         return DefaultForwardingObjective.builder()
                 .withPriority(request.priority().priorityValue())
                 .withSelector(request.selector())
                 .fromApp(appId)
                 .withFlag(ForwardingObjective.Flag.VERSATILE)
-                .withTreatment(tBuilder.build())
+                .withTreatment(treatment)
                 .makePermanent();
     }