[VOL-5475] upgrade go to 1.24.5 and golangci-lint version to 2.2.2
Change-Id: Ife0505678221ac9769b3443bedfdf1ef4387ae31
Signed-off-by: mgouda <madhumati.gouda@radisys.com>
diff --git a/internal/pkg/core/device_handler.go b/internal/pkg/core/device_handler.go
index c866695..9f9b187 100755
--- a/internal/pkg/core/device_handler.go
+++ b/internal/pkg/core/device_handler.go
@@ -2800,11 +2800,12 @@
egressPortType := plt.IntfIDToPortTypeName(uint32(egressPortNo))
var err error
- if egressPortType == voltha.Port_ETHERNET_UNI {
+ switch egressPortType {
+ case voltha.Port_ETHERNET_UNI:
err = dh.PacketOutUNI(ctx, egressPortNo, packet)
- } else if egressPortType == voltha.Port_ETHERNET_NNI {
+ case voltha.Port_ETHERNET_NNI:
err = dh.PacketOutNNI(ctx, egressPortNo, packet)
- } else {
+ default:
logger.Warnw(ctx, "packet-out-to-this-interface-type-not-implemented", log.Fields{
"egress-port-no": egressPortNo,
"egressPortType": egressPortType,
@@ -3506,21 +3507,22 @@
*mcastFlowOrGroupCb.errChan <- err
}
} else { // mcast group
- if mcastFlowOrGroupCb.flowOrGroupAction == McastFlowOrGroupAdd {
+ switch mcastFlowOrGroupCb.flowOrGroupAction {
+ case McastFlowOrGroupAdd:
logger.Debugw(mcastFlowOrGroupCb.ctx, "adding-mcast-group",
log.Fields{"device-id": dh.device.Id,
"groupToAdd": mcastFlowOrGroupCb.group})
err := dh.groupMgr.AddGroup(mcastFlowOrGroupCb.ctx, mcastFlowOrGroupCb.group)
// Pass the return value over the return channel
*mcastFlowOrGroupCb.errChan <- err
- } else if mcastFlowOrGroupCb.flowOrGroupAction == McastFlowOrGroupModify { // group modify
+ case McastFlowOrGroupModify: // group modify
logger.Debugw(mcastFlowOrGroupCb.ctx, "modifying-mcast-group",
log.Fields{"device-id": dh.device.Id,
"groupToModify": mcastFlowOrGroupCb.group})
err := dh.groupMgr.ModifyGroup(mcastFlowOrGroupCb.ctx, mcastFlowOrGroupCb.group)
// Pass the return value over the return channel
*mcastFlowOrGroupCb.errChan <- err
- } else { // group remove
+ default: // group remove
logger.Debugw(mcastFlowOrGroupCb.ctx, "removing-mcast-group",
log.Fields{"device-id": dh.device.Id,
"groupToRemove": mcastFlowOrGroupCb.group})
@@ -3608,7 +3610,8 @@
logger.Debugw(ctx, "getOltPortCounters ctx Done ", log.Fields{"oltPortInfo": oltPortInfo})
return errResp(extension.GetValueResponse_ERROR, extension.GetValueResponse_TIMEOUT)
}
- if oltPortInfo.PortType == extension.GetOltPortCounters_Port_ETHERNET_NNI {
+ switch oltPortInfo.PortType {
+ case extension.GetOltPortCounters_Port_ETHERNET_NNI:
// get nni stats
intfID := plt.PortNoToIntfID(oltPortInfo.PortNo, voltha.Port_ETHERNET_NNI)
logger.Debugw(ctx, "getOltPortCounters intfID ", log.Fields{"intfID": intfID})
@@ -3619,7 +3622,7 @@
}
dh.portStats.updateGetOltPortCountersResponse(ctx, &singleValResp, cmnni)
return &singleValResp
- } else if oltPortInfo.PortType == extension.GetOltPortCounters_Port_PON_OLT {
+ case extension.GetOltPortCounters_Port_PON_OLT:
// get pon stats
intfID := plt.PortNoToIntfID(oltPortInfo.PortNo, voltha.Port_PON_OLT)
if val, ok := dh.activePorts.Load(intfID); ok && val == true {