fix(evpn): addressing reviews third attempt

Signed-off-by: Dimitrios Markou <[email protected]>
opiproject · Oct 11, 2024 · 37653fb · 37653fb
1 parent ec7a59c
commit 37653fb
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 10 deletions.
diff --git a/pkg/frr/frr.go b/pkg/frr/frr.go
@@ -217,7 +217,7 @@ func handlesvi(objectData *eventbus.ObjectData) {
 		log.Printf("%+v\n", comp)
 
 		// Checking the timer to decide if we need to replay or not
-		comp.Replay = utils.CheckReplayThreshold(comp.Timer, replayThreshold)
+		comp.CheckReplayThreshold(replayThreshold)
 
 		err := infradb.UpdateSviStatus(objectData.Name, objectData.ResourceVersion, objectData.NotificationID, nil, comp)
 		if err != nil {
@@ -240,7 +240,7 @@ func handlesvi(objectData *eventbus.ObjectData) {
 		log.Printf("%+v\n", comp)
 
 		// Checking the timer to decide if we need to replay or not
-		comp.Replay = utils.CheckReplayThreshold(comp.Timer, replayThreshold)
+		comp.CheckReplayThreshold(replayThreshold)
 
 		err := infradb.UpdateSviStatus(objectData.Name, objectData.ResourceVersion, objectData.NotificationID, nil, comp)
 		if err != nil {
@@ -318,7 +318,7 @@ func handlevrf(objectData *eventbus.ObjectData) {
 		log.Printf("%+v\n", comp)
 
 		// Checking the timer to decide if we need to replay or not
-		comp.Replay = utils.CheckReplayThreshold(comp.Timer, replayThreshold)
+		comp.CheckReplayThreshold(replayThreshold)
 
 		err := infradb.UpdateVrfStatus(objectData.Name, objectData.ResourceVersion, objectData.NotificationID, nil, comp)
 		if err != nil {
@@ -341,7 +341,7 @@ func handlevrf(objectData *eventbus.ObjectData) {
 		log.Printf("%+v\n", comp)
 
 		// Checking the timer to decide if we need to replay or not
-		comp.Replay = utils.CheckReplayThreshold(comp.Timer, replayThreshold)
+		comp.CheckReplayThreshold(replayThreshold)
 
 		err := infradb.UpdateVrfStatus(objectData.Name, objectData.ResourceVersion, objectData.NotificationID, nil, comp)
 		if err != nil {

diff --git a/pkg/infradb/common/common.go b/pkg/infradb/common/common.go
@@ -38,6 +38,11 @@ type Component struct {
 	Replay bool
 }
 
+// CheckReplayThreshold checks if the replay threshold has been exceeded
+func (c *Component) CheckReplayThreshold(replayThreshold time.Duration) {
+	c.Replay = (c.Timer > replayThreshold)
+}
+
 func ip4ToInt(ip net.IP) uint32 {
 	if !reflect.ValueOf(ip).IsZero() {
 		return uint32(ip[0])<<24 | uint32(ip[1])<<16 | uint32(ip[2])<<8 | uint32(ip[3])

diff --git a/pkg/utils/helpers.go b/pkg/utils/helpers.go
@@ -10,7 +10,6 @@ import (
 	"net"
 	"os/exec"
 	"regexp"
-	"time"
 
 	"github.com/vishvananda/netlink"
 	"go.einride.tech/aip/fieldmask"
@@ -79,11 +78,6 @@ func GetIPAddress(dev string) net.IPNet {
 	return *validIps[0].IPNet
 }
 
-// CheckReplayThreshold checks if the replay threshold has been exceeded
-func CheckReplayThreshold(currentTimer, replayThreshold time.Duration) bool {
-	return (currentTimer > replayThreshold)
-}
-
 // ComposeHandlerName this function concatenates the module name and type
 func ComposeHandlerName(moduleName, kindOfType string) string {
 	return moduleName + "." + kindOfType