commit 105581bdf3da52dcfd898e0562ef205f7e093f9f
author Akash Reddy Kankanala <akash.kankanala@radisys.com> Wed Sep 11 05:20:38 2024 +0530
committer Akash Reddy Kankanala <akash.kankanala@radisys.com> Wed Apr 09 14:34:11 2025 +0530
tree 72050ebb3167ef06b00337031deea92906571a42
parent 7a531c765febd4ce17b330cb088c2006f5fae5ad

[VOL-5374] Upgrade go version to v1.23

Change-Id: I11655451672cc7bae9cc92cddcaa563ac50d7de4
Signed-off-by: Akash Reddy Kankanala <akash.kankanala@radisys.com>

internal/pkg/controller/controller.go

diff --git a/internal/pkg/controller/controller.go b/internal/pkg/controller/controller.go
index d04e00e..65b435e 100644
--- a/internal/pkg/controller/controller.go
+++ b/internal/pkg/controller/controller.go
@@ -62,6 +62,8 @@
 }
 
 // VoltController structure
+//
+//nolint:govet
 type VoltController struct {
 	ctx                     context.Context
 	app                     intf.App
@@ -74,7 +76,7 @@
 	rebootLock              sync.Mutex
 	deviceTableSyncDuration time.Duration // Time interval between each cycle of audit task
 	maxFlowRetryDuration    time.Duration // Maximum duration for which flows will be retried upon failures
-	maxFlowRetryAttempts    uint32        // maxFlowRetryAttempt = maxFlowRetryDuration / deviceTableSyncDuration
+	maxFlowRetryAttempts    int64         // maxFlowRetryAttempt = maxFlowRetryDuration / deviceTableSyncDuration
 	RebootFlow              bool
 }
 
@@ -108,7 +110,7 @@
 
 // SetMaxFlowRetryAttempts - sets max flow retry attempts
 func (v *VoltController) SetMaxFlowRetryAttempts() {
-	v.maxFlowRetryAttempts = uint32((v.maxFlowRetryDuration / v.deviceTableSyncDuration))
+	v.maxFlowRetryAttempts = int64((v.maxFlowRetryDuration / v.deviceTableSyncDuration))
 }
 
 // GetDeviceTableSyncDuration - returns configured device table sync duration
@@ -117,7 +119,7 @@
 }
 
 // GetMaxFlowRetryAttempt - returns max flow retry attempst
-func (v *VoltController) GetMaxFlowRetryAttempt() uint32 {
+func (v *VoltController) GetMaxFlowRetryAttempt() int64 {
 	return v.maxFlowRetryAttempts
 }
 

internal/pkg/controller/device.go

diff --git a/internal/pkg/controller/device.go b/internal/pkg/controller/device.go
index c8caddd..497339b 100644
--- a/internal/pkg/controller/device.go
+++ b/internal/pkg/controller/device.go
@@ -1080,13 +1080,13 @@
 // IsFlowDelThresholdReached - check if the attempts for flow delete has reached threshold or not
 func (d *Device) IsFlowDelThresholdReached(flowCount uint32, cookie uint64) bool {
 	logger.Debugw(ctx, "Check flow delete threshold", log.Fields{"Cookie": cookie, "FlowCount": flowCount})
-	return flowCount >= GetController().GetMaxFlowRetryAttempt()
+	return flowCount >= uint32(GetController().GetMaxFlowRetryAttempt())
 }
 
 // IsFlowAddThresholdReached - check if the attempts for flow add has reached threshold or not
 func (d *Device) IsFlowAddThresholdReached(flowCount uint32, cookie uint64) bool {
 	logger.Debugw(ctx, "Check flow add threshold", log.Fields{"Cookie": cookie, "FlowCount": flowCount})
-	return flowCount >= GetController().GetMaxFlowRetryAttempt()
+	return flowCount >= uint32(GetController().GetMaxFlowRetryAttempt())
 }
 
 func (d *Device) UpdateFlowCount(cntx context.Context, cookie uint64) {