[VOL-5475] upgrade go to 1.24.5 and golangci-lint version to 2.2.2
Signed-off-by: mgouda <madhumati.gouda@radisys.com>
Change-Id: Ic9fe6b74bdb86f8313a04559b59991d66307d5bb
diff --git a/internal/pkg/application/service.go b/internal/pkg/application/service.go
index 3fd1a4e..b36cb8f 100644
--- a/internal/pkg/application/service.go
+++ b/internal/pkg/application/service.go
@@ -32,13 +32,11 @@
"strconv"
"strings"
"sync"
- infraerrorCodes "voltha-go-controller/internal/pkg/errorcodes"
"github.com/google/gopacket/layers"
"voltha-go-controller/database"
"voltha-go-controller/internal/pkg/controller"
- cntlr "voltha-go-controller/internal/pkg/controller"
errorCodes "voltha-go-controller/internal/pkg/errorcodes"
"voltha-go-controller/internal/pkg/of"
"voltha-go-controller/internal/pkg/util"
@@ -304,12 +302,12 @@
logger.Debugw(ctx, "Add US & DS HSIA Flows for the service", log.Fields{"ServiceName": vs.Name})
if err := vs.AddUsHsiaFlows(cntx); err != nil {
logger.Errorw(ctx, "Error adding US HSIA Flows", log.Fields{"Service": vs.Name, "Port": vs.Port, "Reason": err.Error()})
- statusCode, statusMessage := infraerrorCodes.GetErrorInfo(err)
+ statusCode, statusMessage := errorCodes.GetErrorInfo(err)
vs.triggerServiceFailureInd(statusCode, statusMessage)
}
if err := vs.AddDsHsiaFlows(cntx); err != nil {
logger.Errorw(ctx, "Error adding DS HSIA Flows", log.Fields{"Service": vs.Name, "Port": vs.Port, "Reason": err.Error()})
- statusCode, statusMessage := infraerrorCodes.GetErrorInfo(err)
+ statusCode, statusMessage := errorCodes.GetErrorInfo(err)
vs.triggerServiceFailureInd(statusCode, statusMessage)
}
}
@@ -319,13 +317,13 @@
logger.Debugw(ctx, "Delete US & DS HSIA Flows for the service", log.Fields{"ServiceName": vs.Name})
if err := vs.DelUsHsiaFlows(cntx, false); err != nil {
logger.Errorw(ctx, "Error deleting US HSIA Flows", log.Fields{"Service": vs.Name, "Port": vs.Port, "Reason": err.Error()})
- statusCode, statusMessage := infraerrorCodes.GetErrorInfo(err)
+ statusCode, statusMessage := errorCodes.GetErrorInfo(err)
vs.triggerServiceFailureInd(statusCode, statusMessage)
}
if err := vs.DelDsHsiaFlows(cntx, false); err != nil {
logger.Errorw(ctx, "Error deleting DS HSIA Flows", log.Fields{"Service": vs.Name, "Port": vs.Port, "Reason": err.Error()})
- statusCode, statusMessage := infraerrorCodes.GetErrorInfo(err)
+ statusCode, statusMessage := errorCodes.GetErrorInfo(err)
vs.triggerServiceFailureInd(statusCode, statusMessage)
}
}
@@ -384,14 +382,14 @@
usflows, err := vs.BuildUsHsiaFlows(pbits)
if err != nil {
logger.Errorw(ctx, "Error Building HSIA US flows", log.Fields{"Device": vs.Device, "Service": vs.Name, "Reason": err.Error()})
- statusCode, statusMessage := infraerrorCodes.GetErrorInfo(err)
+ statusCode, statusMessage := errorCodes.GetErrorInfo(err)
vs.triggerServiceFailureInd(statusCode, statusMessage)
continue
}
usflows.MigrateCookie = vgcRebooted
if err := vs.AddFlows(cntx, device, usflows); err != nil {
logger.Errorw(ctx, "Error adding HSIA US flows", log.Fields{"Device": vs.Device, "Service": vs.Name, "Reason": err.Error()})
- statusCode, statusMessage := infraerrorCodes.GetErrorInfo(err)
+ statusCode, statusMessage := errorCodes.GetErrorInfo(err)
vs.triggerServiceFailureInd(statusCode, statusMessage)
}
}
@@ -432,7 +430,7 @@
dsflows.MigrateCookie = vgcRebooted
if err = vs.AddFlows(cntx, device, dsflows); err != nil {
logger.Errorw(ctx, "Failed to add HSIA DS flows", log.Fields{"Device": vs.Device, "Service": vs.Name, "Reason": err})
- statusCode, statusMessage := infraerrorCodes.GetErrorInfo(err)
+ statusCode, statusMessage := errorCodes.GetErrorInfo(err)
vs.triggerServiceFailureInd(statusCode, statusMessage)
}
} else {
@@ -446,7 +444,7 @@
dsflows.MigrateCookie = vgcRebooted
if err := vs.AddFlows(cntx, device, dsflows); err != nil {
logger.Errorw(ctx, "Failed to add HSIA DS flows", log.Fields{"Device": vs.Device, "Service": vs.Name, "Reason": err})
- statusCode, statusMessage := infraerrorCodes.GetErrorInfo(err)
+ statusCode, statusMessage := errorCodes.GetErrorInfo(err)
vs.triggerServiceFailureInd(statusCode, statusMessage)
}
} else {
@@ -454,14 +452,14 @@
dsflows, err := vs.BuildDsHsiaFlows(of.PbitType(matchPbit))
if err != nil {
logger.Errorw(ctx, "Error Building HSIA DS flows", log.Fields{"Device": vs.Device, "Service": vs.Name, "Reason": err.Error()})
- statusCode, statusMessage := infraerrorCodes.GetErrorInfo(err)
+ statusCode, statusMessage := errorCodes.GetErrorInfo(err)
vs.triggerServiceFailureInd(statusCode, statusMessage)
continue
}
dsflows.MigrateCookie = vgcRebooted
if err := vs.AddFlows(cntx, device, dsflows); err != nil {
logger.Errorw(ctx, "Failed to Add HSIA DS flows", log.Fields{"Device": vs.Device, "Service": vs.Name, "Reason": err})
- statusCode, statusMessage := infraerrorCodes.GetErrorInfo(err)
+ statusCode, statusMessage := errorCodes.GetErrorInfo(err)
vs.triggerServiceFailureInd(statusCode, statusMessage)
}
}
@@ -493,14 +491,14 @@
usflows, err := vs.BuildUsHsiaFlows(pbits)
if err != nil {
logger.Errorw(ctx, "Error Building HSIA US flows", log.Fields{"Device": vs.Device, "ServiceName": vs.Name, "Reason": err.Error()})
- statusCode, statusMessage := infraerrorCodes.GetErrorInfo(err)
+ statusCode, statusMessage := errorCodes.GetErrorInfo(err)
vs.triggerServiceFailureInd(statusCode, statusMessage)
continue
}
usflows.MigrateCookie = vgcRebooted
if err = vs.DelFlows(cntx, device, usflows, delFlowsInDevice); err != nil {
logger.Errorw(ctx, "Error Deleting HSIA US flows", log.Fields{"Device": vs.Device, "ServiceName": vs.Name, "Reason": err.Error()})
- statusCode, statusMessage := infraerrorCodes.GetErrorInfo(err)
+ statusCode, statusMessage := errorCodes.GetErrorInfo(err)
vs.triggerServiceFailureInd(statusCode, statusMessage)
}
}
@@ -530,7 +528,7 @@
dsflows.MigrateCookie = vgcRebooted
if err = vs.DelFlows(cntx, device, dsflows, delFlowsInDevice); err != nil {
logger.Errorw(ctx, "Error Deleting HSIA DS flows", log.Fields{"Device": vs.Device, "ServiceName": vs.Name, "Reason": err.Error()})
- statusCode, statusMessage := infraerrorCodes.GetErrorInfo(err)
+ statusCode, statusMessage := errorCodes.GetErrorInfo(err)
vs.triggerServiceFailureInd(statusCode, statusMessage)
}
} else if _, ok := vs.DsRemarkPbitsMap[int(PbitMatchAll)]; ok {
@@ -541,7 +539,7 @@
dsflows.MigrateCookie = vgcRebooted
if err = vs.DelFlows(cntx, device, dsflows, delFlowsInDevice); err != nil {
logger.Errorw(ctx, "Error Deleting HSIA DS flows", log.Fields{"Device": vs.Device, "ServiceName": vs.Name, "Reason": err.Error()})
- statusCode, statusMessage := infraerrorCodes.GetErrorInfo(err)
+ statusCode, statusMessage := errorCodes.GetErrorInfo(err)
vs.triggerServiceFailureInd(statusCode, statusMessage)
}
} else {
@@ -549,14 +547,14 @@
dsflows, err := vs.BuildDsHsiaFlows(of.PbitType(matchPbit))
if err != nil {
logger.Errorw(ctx, "Error Building HSIA DS flows", log.Fields{"Device": vs.Device, "ServiceName": vs.Name, "Reason": err.Error()})
- statusCode, statusMessage := infraerrorCodes.GetErrorInfo(err)
+ statusCode, statusMessage := errorCodes.GetErrorInfo(err)
vs.triggerServiceFailureInd(statusCode, statusMessage)
continue
}
dsflows.MigrateCookie = vgcRebooted
if err = vs.DelFlows(cntx, device, dsflows, delFlowsInDevice); err != nil {
logger.Errorw(ctx, "Error Deleting HSIA DS flows", log.Fields{"Device": vs.Device, "ServiceName": vs.Name, "Reason": err.Error()})
- statusCode, statusMessage := infraerrorCodes.GetErrorInfo(err)
+ statusCode, statusMessage := errorCodes.GetErrorInfo(err)
vs.triggerServiceFailureInd(statusCode, statusMessage)
}
}
@@ -807,10 +805,11 @@
subflow1.SetGoToTable(1)
subflow1.SetInPort(inport)
- if vs.ServiceType == DpuMgmtTraffic {
+ switch vs.ServiceType {
+ case DpuMgmtTraffic:
subflow1.SetMatchPbit(vs.UsPonCTagPriority)
subflow1.SetPcp(vs.UsPonSTagPriority)
- } else if vs.ServiceType == DpuAncpTraffic {
+ case DpuAncpTraffic:
subflow1.SetPcp(vs.UsPonSTagPriority)
}
if err := vs.setUSMatchActionVlanT0(subflow1); err != nil {
@@ -1334,7 +1333,7 @@
device.RegisterFlowAddEvent(cookie, fe)
vs.PendingFlows[cookie] = true
}
- return cntlr.GetController().AddFlows(cntx, vs.Port, device.Name, flow)
+ return controller.GetController().AddFlows(cntx, vs.Port, device.Name, flow)
}
// FlowInstallSuccess - Called when corresponding service flow installation is success
@@ -1424,7 +1423,7 @@
device.RegisterFlowDelEvent(cookie, fe)
}
}
- return cntlr.GetController().DelFlows(cntx, vs.Port, device.Name, flow, delFlowsInDevice)
+ return controller.GetController().DelFlows(cntx, vs.Port, device.Name, flow, delFlowsInDevice)
}
// CheckAndDeleteService - remove service from DB is there are no pending flows to be removed