commit 7c49b7928f0b80a98f17278047a2ae89146be3ee
author Andrea Campanella <andrea@opennetworking.org> Mon May 11 11:36:53 2020 +0200
committer Andrea Campanella <andrea@opennetworking.org> Mon May 18 10:09:59 2020 +0200
tree cd8fb8fa14bacf671182b5dc18c24ae766fd2192
parent af39b4c10a3b3da57a4b030ce09ae34535f0130d

[VOL-3067] Harmonizing DHCP and IGMP flags

Change-Id: Id59e7cc1a678e2cf16f0d877feb897610d52d61b

app/src/main/java/org/opencord/olt/impl/Olt.java

diff --git a/app/src/main/java/org/opencord/olt/impl/Olt.java b/app/src/main/java/org/opencord/olt/impl/Olt.java
index ad52030..3e2aa83 100644
--- a/app/src/main/java/org/opencord/olt/impl/Olt.java
+++ b/app/src/main/java/org/opencord/olt/impl/Olt.java
@@ -506,14 +506,10 @@
         ForwardingObjective.Builder downFwd =
                 oltFlowService.createDownBuilder(uplink, subscriberPort, downstreamMeterId, uniTag);
 
-        if (uniTag.getIsIgmpRequired()) {
-            oltFlowService.processIgmpFilteringObjectives(deviceId, subscriberPort,
-                                                          upstreamMeterId, uniTag, false, true);
-        }
-        if (uniTag.getIsDhcpRequired()) {
-            oltFlowService.processDhcpFilteringObjectives(deviceId, subscriberPort,
-                                                          upstreamMeterId, uniTag, false, true);
-        }
+        oltFlowService.processIgmpFilteringObjectives(deviceId, subscriberPort,
+                                                      upstreamMeterId, uniTag, false, true);
+        oltFlowService.processDhcpFilteringObjectives(deviceId, subscriberPort,
+                                                      upstreamMeterId, uniTag, false, true);
 
         flowObjectiveService.forward(deviceId, upFwd.remove(new ObjectiveContext() {
             @Override
@@ -753,15 +749,11 @@
                 oltFlowService.processEapolFilteringObjectives(deviceId, subscriberPort,
                                                                tagInfo.getUpstreamBandwidthProfile(),
                                                                null, tagInfo.getPonCTag(), true);
-                if (tagInfo.getIsDhcpRequired()) {
-                    oltFlowService.processDhcpFilteringObjectives(deviceId, subscriberPort,
-                                                                  upstreamMeterId, tagInfo, true, true);
-                }
+                oltFlowService.processDhcpFilteringObjectives(deviceId, subscriberPort,
+                                                              upstreamMeterId, tagInfo, true, true);
 
-                if (tagInfo.getIsIgmpRequired()) {
-                    oltFlowService.processIgmpFilteringObjectives(deviceId, subscriberPort, upstreamMeterId, tagInfo,
-                                                                  true, true);
-                }
+                oltFlowService.processIgmpFilteringObjectives(deviceId, subscriberPort, upstreamMeterId, tagInfo,
+                                                              true, true);
                 updateProgrammedSubscriber(cp, tagInfo, true);
                 post(new AccessDeviceEvent(type, deviceId, port, tagInfo.getPonSTag(), tagInfo.getPonCTag(),
                                            tagInfo.getTechnologyProfileId()));