commit b8438aaffd2e6ac1d58b7771d4944b4f495112f5
author Naga Manjunath <Naga.Manjunath@radisys.com> Thu Jan 02 17:52:33 2020 +0530
committer David K. Bainbridge <dbainbri@ciena.com> Thu Jan 02 14:41:55 2020 -0800
tree 2165200d2f68202f1b3f74ea9e940bd20f465b4e
parent ae41e2b0f11144a7e69b781bb071216f7d702e2c

[VOL-2399] Updated with fix for ipv6 trap flows on nni

Change-Id: Ie0819372bec8640584f40b49faa4f9da24f8eeb8

adaptercore/openolt_flowmgr.go

diff --git a/adaptercore/openolt_flowmgr.go b/adaptercore/openolt_flowmgr.go
index cb746c2..ef6dad5 100644
--- a/adaptercore/openolt_flowmgr.go
+++ b/adaptercore/openolt_flowmgr.go
@@ -1630,6 +1630,7 @@
 }
 
 // AddFlow add flow to device
+// nolint: gocyclo
 func (f *OpenOltFlowMgr) AddFlow(flow *ofp.OfpFlowStats, flowMetadata *voltha.FlowMetadata) {
 	classifierInfo := make(map[string]interface{})
 	actionInfo := make(map[string]interface{})
@@ -1666,7 +1667,7 @@
 	if ipProto, ok := classifierInfo[IPProto]; ok {
 		if ipProto.(uint32) == IPProtoDhcp {
 			if udpSrc, ok := classifierInfo[UDPSrc]; ok {
-				if udpSrc.(uint32) == uint32(67) {
+				if udpSrc.(uint32) == uint32(67) || udpSrc.(uint32) == uint32(546) {
 					log.Debug("trap-dhcp-from-nni-flow")
 					f.addDHCPTrapFlowOnNNI(flow, classifierInfo, portNo)
 					return