commit f29ffd777586a997bb75eeb244719092978978c4
author Yi Tseng <yi@opennetworking.org> Wed Nov 29 10:49:20 2017 -0800
committer Yi Tseng <yi@opennetworking.org> Fri Dec 01 21:34:07 2017 +0000
tree 2f7ab44e2135588ce13e6eae94adac24e2fc2144
parent bf5a0e9fd5029aa0d2d08b4b139fe38195ff20af

[CORD-2316] DHCP relay should ignore the DHCP packet if configed instead of drop it

Change-Id: Iebaf7130c0945ec5850b2e25d28d7aa33b9f9db3

apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java

diff --git a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
index c9f0d84..6c5390c 100644
--- a/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
+++ b/apps/dhcprelay/src/main/java/org/onosproject/dhcprelay/Dhcp4HandlerImpl.java
@@ -1533,7 +1533,6 @@
      * @param op the operation, ADD to install; REMOVE to uninstall rules
      */
     private void processIgnoreVlanRule(DeviceId deviceId, VlanId vlanId, Objective.Operation op) {
-        TrafficTreatment dropTreatment = DefaultTrafficTreatment.builder().wipeDeferred().build();
         AtomicInteger installedCount = new AtomicInteger(DHCP_SELECTORS.size());
         DHCP_SELECTORS.forEach(trafficSelector -> {
             TrafficSelector selector = DefaultTrafficSelector.builder(trafficSelector)
@@ -1544,7 +1543,7 @@
                     .withFlag(ForwardingObjective.Flag.VERSATILE)
                     .withSelector(selector)
                     .withPriority(IGNORE_CONTROL_PRIORITY)
-                    .withTreatment(dropTreatment)
+                    .withTreatment(DefaultTrafficTreatment.emptyTreatment())
                     .fromApp(appId);