[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: I0d7ded6f836ae4a579d0167b491f01e10ada4b13
diff --git a/internal/pkg/common/omci_cc.go b/internal/pkg/common/omci_cc.go
index 01c6fbf..89d1afb 100755
--- a/internal/pkg/common/omci_cc.go
+++ b/internal/pkg/common/omci_cc.go
@@ -30,7 +30,6 @@
"github.com/google/gopacket"
// TODO!!! Some references could be resolved auto, but some need specific context ....
- gp "github.com/google/gopacket"
"github.com/opencord/omci-lib-go/v2"
me "github.com/opencord/omci-lib-go/v2/generated"
@@ -78,7 +77,7 @@
// CallbackPairEntry to be used for OMCI send/receive correlation
type CallbackPairEntry struct {
CbRespChannel chan Message
- CbFunction func(context.Context, *omci.OMCI, *gp.Packet, chan Message) error
+ CbFunction func(context.Context, *omci.OMCI, *gopacket.Packet, chan Message) error
FramePrint bool //true for printing
}
@@ -231,7 +230,7 @@
}
// Rx handler for omci messages
-func (oo *OmciCC) receiveOnuMessage(ctx context.Context, omciMsg *omci.OMCI, packet *gp.Packet) error {
+func (oo *OmciCC) receiveOnuMessage(ctx context.Context, omciMsg *omci.OMCI, packet *gopacket.Packet) error {
logger.Debugw(ctx, "rx-onu-autonomous-message", log.Fields{"omciMsgType": omciMsg.MessageType,
"payload": hex.EncodeToString(omciMsg.Payload)})
switch omciMsg.MessageType {
@@ -841,7 +840,7 @@
*/
// supply a response handler for omci response messages to be transferred to the requested FSM
-func (oo *OmciCC) receiveOmciResponse(ctx context.Context, omciMsg *omci.OMCI, packet *gp.Packet, respChan chan Message) error {
+func (oo *OmciCC) receiveOmciResponse(ctx context.Context, omciMsg *omci.OMCI, packet *gopacket.Packet, respChan chan Message) error {
logger.Debugw(ctx, "omci-message-response - transfer on omciRespChannel", log.Fields{"omciMsgType": omciMsg.MessageType,
"transCorrId": strconv.FormatInt(int64(omciMsg.TransactionID), 16), "device-id": oo.deviceID})
@@ -1581,7 +1580,7 @@
EntityID: entityID,
Attributes: requestedAttributes,
}
- var messageSet omci.DeviceIdent = omci.BaselineIdent
+ var messageSet = omci.BaselineIdent
if isExtendedOmci {
messageSet = omci.ExtendedIdent
}
@@ -4585,7 +4584,7 @@
//TODO!!!: don't know by now on how to generate the possibly needed AR (or enforce it to 0) with current omci-lib
// by now just try to send it as defined by omci-lib
msgType := omci.DownloadSectionRequestType
- var timeout int = 0 //default value for no response expected
+ var timeout = 0 //default value for no response expected
if aAckRequest > 0 {
msgType = omci.DownloadSectionRequestWithResponseType
timeout = aTimeout
@@ -4852,7 +4851,7 @@
}
// nolint: gocyclo
-func (oo *OmciCC) isSuccessfulResponseWithMibDataSync(ctx context.Context, omciMsg *omci.OMCI, packet *gp.Packet) (bool, error) {
+func (oo *OmciCC) isSuccessfulResponseWithMibDataSync(ctx context.Context, omciMsg *omci.OMCI, packet *gopacket.Packet) (bool, error) {
nextLayer, err := omci.MsgTypeToNextLayer(omciMsg.MessageType, false)
if err != nil {
@@ -4863,13 +4862,14 @@
if msgLayer != nil {
// Note: Due to relaxed decoding, you may now still have a decoding error attached to the layers
if failure := (*packet).ErrorLayer(); failure != nil {
- if nextLayer == omci.LayerTypeMibUploadNextResponse {
+ switch nextLayer {
+ case omci.LayerTypeMibUploadNextResponse:
// In the case of MibUploadNextResponse, we let the packet pass so that later processing
// can examine for UnkonwnMEs and UnknownAttributes
logger.Debug(ctx, "omci-message: MibUploadNextResponse packet with ErrorLayer - let it pass",
log.Fields{"device-id": oo.deviceID, "error": failure.Error()})
return false, nil
- } else if nextLayer == omci.LayerTypeGetResponse {
+ case omci.LayerTypeGetResponse:
if resp := msgLayer.(*omci.GetResponse); resp != nil {
if resp.NextLayerType() == omci.LayerTypeUnknownAttributes {
unknownAttrLayer := (*packet).Layer(omci.LayerTypeUnknownAttributes)