commit 1f8de33a359405c8a9c817cc1c5d935f58649248
author Matteo Scandolo <matteo.scandolo@gmail.com> Mon Dec 06 12:18:24 2021 -0800
committer Matteo Scandolo <matteo.scandolo@gmail.com> Mon Dec 06 12:18:24 2021 -0800
tree 8e73a98bd3e8b5155d7b4e79772a21328ffa0397
parent 8a91c0fe31d28207874fa9078343918cb8b2d135

[VOL-4495] Handling both cases in which the NNI goes down

Change-Id: I57e93b91e5a80f5afe9bae9e5f734186b328b965

impl/src/main/java/org/opencord/olt/impl/OltFlowService.java

diff --git a/impl/src/main/java/org/opencord/olt/impl/OltFlowService.java b/impl/src/main/java/org/opencord/olt/impl/OltFlowService.java
index 477e3a3..376056d 100644
--- a/impl/src/main/java/org/opencord/olt/impl/OltFlowService.java
+++ b/impl/src/main/java/org/opencord/olt/impl/OltFlowService.java
@@ -422,33 +422,36 @@
     public void handleNniFlows(Device device, Port port, FlowOperation action) {
 
         // always handle the LLDP flow
+        log.debug("{} LLDP trap flow on NNI {} for device {}", portWithName(port), device.id(), flowOpToString(action));
         processLldpFilteringObjective(device.id(), port, action);
 
         if (enableDhcpOnNni) {
             if (enableDhcpV4) {
-                log.debug("Installing DHCPv4 trap flow on NNI {} for device {}", portWithName(port), device.id());
+                log.debug("{} DHCPv4 trap flow on NNI {} for device {}", portWithName(port), device.id(),
+                        flowOpToString(action));
                 processDhcpFilteringObjectives(device.id(), port, action, FlowDirection.DOWNSTREAM,
                         67, 68, EthType.EtherType.IPV4.ethType(), IPv4.PROTOCOL_UDP,
                         null, null, nniUniTag);
             }
             if (enableDhcpV6) {
-                log.debug("Installing DHCPv6 trap flow on NNI {} for device {}", portWithName(port), device.id());
+                log.debug("{} DHCPv6 trap flow on NNI {} for device {}", portWithName(port), device.id(),
+                        flowOpToString(action));
                 processDhcpFilteringObjectives(device.id(), port, action, FlowDirection.DOWNSTREAM,
                         546, 547, EthType.EtherType.IPV6.ethType(), IPv6.PROTOCOL_UDP,
                         null, null, nniUniTag);
             }
         } else {
-            log.info("DHCP is not required on NNI {} for device {}", portWithName(port), device.id());
+            log.debug("DHCP is not required on NNI {} for device {}", portWithName(port), device.id());
         }
 
         if (enableIgmpOnNni) {
-            log.debug("Installing IGMP flow on NNI {} for device {}", portWithName(port), device.id());
+            log.debug("{} IGMP flow on NNI {} for device {}", portWithName(port), device.id(), flowOpToString(action));
             processIgmpFilteringObjectives(device.id(), port, action, FlowDirection.DOWNSTREAM,
                     null, null, NONE_TP_ID, VlanId.NONE, VlanId.ANY, -1);
         }
 
         if (enablePppoe) {
-            log.debug("Installing PPPoE flow on NNI {} for device {}", port.number(), device.id());
+            log.debug("{} PPPoE flow on NNI {} for device {}", port.number(), device.id(), flowOpToString(action));
             processPPPoEDFilteringObjectives(device.id(), port, action, FlowDirection.DOWNSTREAM,
                     null, null, NONE_TP_ID, VlanId.NONE, VlanId.ANY, null);
         }