commit d26f6b153a65ae0b1cfda5ef76661740f22266ad
author divyadesai <divya.desai@infosys.com> Thu Mar 19 06:30:28 2020 +0000
committer Scott Baker <scottb@opennetworking.org> Mon Mar 23 15:33:44 2020 +0000
tree 89099e21e6b81a4e57d6870c28e74274f62ce797
parent 65409d8accf7da0347b20e255774b90ef115f53e

[VOL-2782] Update go.mod of voltha-go,open-olt-adapter,ofagent-go and voltctl to be compatible with latest version of voltha-lig-go

Change-Id: Idd1a36b6059927af9a4f3c12581663d587a19176

internal/pkg/core/openolt_flowmgr_test.go

diff --git a/internal/pkg/core/openolt_flowmgr_test.go b/internal/pkg/core/openolt_flowmgr_test.go
index 2890b19..6641e6e 100644
--- a/internal/pkg/core/openolt_flowmgr_test.go
+++ b/internal/pkg/core/openolt_flowmgr_test.go
@@ -231,7 +231,7 @@
 			fu.Output(1),
 		},
 	}
-	ofpstats := fu.MkFlowStat(fa)
+	ofpstats, _ := fu.MkFlowStat(fa)
 	ofpstats.Cookie = ofpstats.Id
 	lldpFa := &fu.FlowArgs{
 		KV: fu.OfpFlowModArgs{"priority": 1000, "cookie": 48132224281636694},
@@ -244,7 +244,7 @@
 			fu.Output(uint32(ofp.OfpPortNo_OFPP_CONTROLLER)),
 		},
 	}
-	lldpofpstats := fu.MkFlowStat(lldpFa)
+	lldpofpstats, _ := fu.MkFlowStat(lldpFa)
 	//lldpofpstats.Cookie = lldpofpstats.Id
 
 	dhcpFa := &fu.FlowArgs{
@@ -259,7 +259,7 @@
 			fu.Output(uint32(ofp.OfpPortNo_OFPP_CONTROLLER)),
 		},
 	}
-	dhcpofpstats := fu.MkFlowStat(dhcpFa)
+	dhcpofpstats, _ := fu.MkFlowStat(dhcpFa)
 	//dhcpofpstats.Cookie = dhcpofpstats.Id
 
 	//multicast flow
@@ -275,7 +275,7 @@
 			fu.Group(1),
 		},
 	}
-	multicastOfpStats := fu.MkFlowStat(multicastFa)
+	multicastOfpStats, _ := fu.MkFlowStat(multicastFa)
 	multicastOfpStats.Id = 1
 
 	type args struct {
@@ -494,18 +494,18 @@
 		},
 		KV: kw6,
 	}
-	ofpstats := fu.MkFlowStat(fa)
-	ofpstats2 := fu.MkFlowStat(fa2)
-	ofpstats3 := fu.MkFlowStat(fa3)
-	ofpstats4 := fu.MkFlowStat(fa4)
-	ofpstats5 := fu.MkFlowStat(fa5)
-	ofpstats6 := fu.MkFlowStat(fa6)
-	ofpstats7 := fu.MkFlowStat(lldpFa)
-	ofpstats8 := fu.MkFlowStat(dhcpFa)
-	ofpstats9 := fu.MkFlowStat(fa9)
-	ofpstats10 := fu.MkFlowStat(fa10)
-	igmpstats := fu.MkFlowStat(igmpFa)
-	ofpstats11 := fu.MkFlowStat(fa11)
+	ofpstats, _ := fu.MkFlowStat(fa)
+	ofpstats2, _ := fu.MkFlowStat(fa2)
+	ofpstats3, _ := fu.MkFlowStat(fa3)
+	ofpstats4, _ := fu.MkFlowStat(fa4)
+	ofpstats5, _ := fu.MkFlowStat(fa5)
+	ofpstats6, _ := fu.MkFlowStat(fa6)
+	ofpstats7, _ := fu.MkFlowStat(lldpFa)
+	ofpstats8, _ := fu.MkFlowStat(dhcpFa)
+	ofpstats9, _ := fu.MkFlowStat(fa9)
+	ofpstats10, _ := fu.MkFlowStat(fa10)
+	igmpstats, _ := fu.MkFlowStat(igmpFa)
+	ofpstats11, _ := fu.MkFlowStat(fa11)
 
 	fmt.Println(ofpstats6, ofpstats9, ofpstats10)
 
@@ -799,10 +799,10 @@
 	actionInfo3 := make(map[string]interface{})
 	classifierInfo4 := make(map[string]interface{})
 	actionInfo4 := make(map[string]interface{})
-	flowState := fu.MkFlowStat(fa)
-	flowState2 := fu.MkFlowStat(fa2)
-	flowState3 := fu.MkFlowStat(fa3)
-	flowState4 := fu.MkFlowStat(fa4)
+	flowState, _ := fu.MkFlowStat(fa)
+	flowState2, _ := fu.MkFlowStat(fa2)
+	flowState3, _ := fu.MkFlowStat(fa3)
+	flowState4, _ := fu.MkFlowStat(fa4)
 	formulateClassifierInfoFromFlow(classifierInfo, flowState)
 	formulateClassifierInfoFromFlow(classifierInfo2, flowState2)
 	formulateClassifierInfoFromFlow(classifierInfo3, flowState3)
@@ -986,7 +986,7 @@
 			fu.Group(1),
 		},
 	}
-	ofpStats := fu.MkFlowStat(multicastFlowArgs)
+	ofpStats, _ := fu.MkFlowStat(multicastFlowArgs)
 	flowMgr.AddFlow(ctx, ofpStats, &voltha.FlowMetadata{})
 
 	//add bucket to the group