[VOL-5583] upgrade go to 1.25.5 and golangci-lint version to 2.8.0
Change-Id: If1b770541eddfba09da91e2fe089d81eec622694
Signed-off-by: madhumatigouda <madhumati.gouda@radisys.com>
diff --git a/VERSION b/VERSION
index bb9f54c..79e3242 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-7.8.3
+7.8.4
diff --git a/go.mod b/go.mod
index 2440be5..74bc598 100644
--- a/go.mod
+++ b/go.mod
@@ -1,6 +1,6 @@
module github.com/opencord/voltha-lib-go/v7
-go 1.25.3
+go 1.25.5
require (
github.com/IBM/sarama v1.46.2
@@ -12,7 +12,7 @@
github.com/grpc-ecosystem/go-grpc-middleware v1.4.0
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/jhump/protoreflect v1.17.0
- github.com/opencord/voltha-protos/v5 v5.7.1
+ github.com/opencord/voltha-protos/v5 v5.7.3
github.com/opentracing/opentracing-go v1.2.0
github.com/phayes/freeport v0.0.0-20220201140144-74d24b5ae9f5
github.com/prometheus/client_golang v1.23.2
diff --git a/go.sum b/go.sum
index dfd5434..f419089 100644
--- a/go.sum
+++ b/go.sum
@@ -144,8 +144,8 @@
github.com/onsi/ginkgo v1.16.5/go.mod h1:+E8gABHa3K6zRBolWtd+ROzc/U5bkGt0FwiG042wbpU=
github.com/onsi/gomega v1.18.1 h1:M1GfJqGRrBrrGGsbxzV5dqM2U2ApXefZCQpkukxYRLE=
github.com/onsi/gomega v1.18.1/go.mod h1:0q+aL8jAiMXy9hbwj2mr5GziHiwhAIQpFmmtT5hitRs=
-github.com/opencord/voltha-protos/v5 v5.7.1 h1:2K3s5nNn/EI6MJPgN1AK2db5RZCMisvK4SXqlOba5xA=
-github.com/opencord/voltha-protos/v5 v5.7.1/go.mod h1:KxcAB17mXTUSjA/rAziV3sDaOpntaFTCEXBJIfN5El4=
+github.com/opencord/voltha-protos/v5 v5.7.3 h1:fE4IwjYQzZ/QdfwUKDCIxirua0++zqu2JgbkKwXm6No=
+github.com/opencord/voltha-protos/v5 v5.7.3/go.mod h1:SoKoF6xSY0+v9A//7y2sAX3YgX2Wy4IeBgyMX5n7eOs=
github.com/opentracing/opentracing-go v1.1.0/go.mod h1:UkNAQd3GIcIGf0SeVgPpRdFStlNbqXla1AfSYxPUl2o=
github.com/opentracing/opentracing-go v1.2.0 h1:uEJPy/1a5RIPAJ0Ov+OIO8OxWu77jEv+1B0VhjKrZUs=
github.com/opentracing/opentracing-go v1.2.0/go.mod h1:GxEUsuufX4nBwe+T+Wl9TAgYrxe9dPLANfrWvHYVTgc=
diff --git a/makefiles/docker/include.mk b/makefiles/docker/include.mk
index 0f053bc..45a19ba 100644
--- a/makefiles/docker/include.mk
+++ b/makefiles/docker/include.mk
@@ -23,7 +23,7 @@
# ------------------- ##
# ---] GLOBALS [--- ##
# ------------------- ##
-VOLTHA_TOOLS_VERSION ?= 3.2.1
+VOLTHA_TOOLS_VERSION ?= 3.2.2
# ---------------------------------
# Induce error for misconfiguration
diff --git a/pkg/flows/flow_utils_test.go b/pkg/flows/flow_utils_test.go
index dcd6b25..2ab06c2 100644
--- a/pkg/flows/flow_utils_test.go
+++ b/pkg/flows/flow_utils_test.go
@@ -19,6 +19,7 @@
"bytes"
"strings"
"testing"
+ "time"
ofp "github.com/opencord/voltha-protos/v5/go/openflow_13"
"github.com/stretchr/testify/assert"
@@ -223,6 +224,7 @@
var ga *GroupArgs
str := fg.String()
+ time.Sleep(2 * time.Millisecond) // Added sleep to address potential timing issues
assert.True(t, str == "")
fa = &FlowArgs{
@@ -256,6 +258,7 @@
fg.AddGroup(group)
str = fg.String()
+ time.Sleep(2 * time.Millisecond) // Added sleep to address potential timing issues
assert.True(t, strings.Contains(str, "id: 11819684229970388353"))
assert.True(t, strings.Contains(str, "group_id: 10"))
assert.True(t, strings.Contains(str, "oxm_class: OFPXMC_OPENFLOW_BASIC"))
diff --git a/vendor/github.com/opencord/voltha-protos/v5/go/adapter_service/adapter_service_grpc.pb.go b/vendor/github.com/opencord/voltha-protos/v5/go/adapter_service/adapter_service_grpc.pb.go
index 7ee44d3..94ce63b 100644
--- a/vendor/github.com/opencord/voltha-protos/v5/go/adapter_service/adapter_service_grpc.pb.go
+++ b/vendor/github.com/opencord/voltha-protos/v5/go/adapter_service/adapter_service_grpc.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
-// - protoc-gen-go-grpc v1.6.0
+// - protoc-gen-go-grpc v1.6.1
// - protoc v4.25.8
// source: voltha_protos/adapter_service.proto
diff --git a/vendor/github.com/opencord/voltha-protos/v5/go/core_adapter/core_adapter.pb.go b/vendor/github.com/opencord/voltha-protos/v5/go/core_adapter/core_adapter.pb.go
index c79baf3..a184eb0 100644
--- a/vendor/github.com/opencord/voltha-protos/v5/go/core_adapter/core_adapter.pb.go
+++ b/vendor/github.com/opencord/voltha-protos/v5/go/core_adapter/core_adapter.pb.go
@@ -82,7 +82,7 @@
state protoimpl.MessageState `protogen:"open.v1"`
ParentId string `protobuf:"bytes,1,opt,name=parent_id,json=parentId,proto3" json:"parent_id,omitempty"`
SerialNumber string `protobuf:"bytes,2,opt,name=serial_number,json=serialNumber,proto3" json:"serial_number,omitempty"`
- OnuId uint32 `protobuf:"varint,3,opt,name=onu_id,json=onuId,proto3" json:"onu_id,omitempty"`
+ OnuId *uint32 `protobuf:"varint,3,opt,name=onu_id,json=onuId,proto3,oneof" json:"onu_id,omitempty"`
ParentPortNo uint32 `protobuf:"varint,4,opt,name=parent_port_no,json=parentPortNo,proto3" json:"parent_port_no,omitempty"`
unknownFields protoimpl.UnknownFields
sizeCache protoimpl.SizeCache
@@ -133,8 +133,8 @@
}
func (x *ChildDeviceFilter) GetOnuId() uint32 {
- if x != nil {
- return x.OnuId
+ if x != nil && x.OnuId != nil {
+ return *x.OnuId
}
return 0
}
@@ -1181,12 +1181,13 @@
" voltha_protos/core_adapter.proto\x12\fcore_adapter\x1a\x1avoltha_protos/common.proto\x1a\x1avoltha_protos/voltha.proto\x1a\x1fvoltha_protos/openflow_13.proto\x1a\x1bvoltha_protos/adapter.proto\x1a\x1avoltha_protos/device.proto\x1a\x1evoltha_protos/extensions.proto\x1a\x1dvoltha_protos/omci_test.proto\"n\n" +
"\x13AdapterRegistration\x12*\n" +
"\aadapter\x18\x01 \x01(\v2\x10.adapter.AdapterR\aadapter\x12+\n" +
- "\x06dTypes\x18\x02 \x01(\v2\x13.device.DeviceTypesR\x06dTypes\"\x92\x01\n" +
+ "\x06dTypes\x18\x02 \x01(\v2\x13.device.DeviceTypesR\x06dTypes\"\xa2\x01\n" +
"\x11ChildDeviceFilter\x12\x1b\n" +
"\tparent_id\x18\x01 \x01(\tR\bparentId\x12#\n" +
- "\rserial_number\x18\x02 \x01(\tR\fserialNumber\x12\x15\n" +
- "\x06onu_id\x18\x03 \x01(\rR\x05onuId\x12$\n" +
- "\x0eparent_port_no\x18\x04 \x01(\rR\fparentPortNo\"q\n" +
+ "\rserial_number\x18\x02 \x01(\tR\fserialNumber\x12\x1a\n" +
+ "\x06onu_id\x18\x03 \x01(\rH\x00R\x05onuId\x88\x01\x01\x12$\n" +
+ "\x0eparent_port_no\x18\x04 \x01(\rR\fparentPortNoB\t\n" +
+ "\a_onu_id\"q\n" +
"\n" +
"PortFilter\x12\x1b\n" +
"\tdevice_id\x18\x01 \x01(\tR\bdeviceId\x12\x12\n" +
@@ -1364,6 +1365,7 @@
if File_voltha_protos_core_adapter_proto != nil {
return
}
+ file_voltha_protos_core_adapter_proto_msgTypes[1].OneofWrappers = []any{}
type x struct{}
out := protoimpl.TypeBuilder{
File: protoimpl.DescBuilder{
diff --git a/vendor/github.com/opencord/voltha-protos/v5/go/core_service/core_services_grpc.pb.go b/vendor/github.com/opencord/voltha-protos/v5/go/core_service/core_services_grpc.pb.go
index 61f346d..1a9d098 100644
--- a/vendor/github.com/opencord/voltha-protos/v5/go/core_service/core_services_grpc.pb.go
+++ b/vendor/github.com/opencord/voltha-protos/v5/go/core_service/core_services_grpc.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
-// - protoc-gen-go-grpc v1.6.0
+// - protoc-gen-go-grpc v1.6.1
// - protoc v4.25.8
// source: voltha_protos/core_services.proto
diff --git a/vendor/github.com/opencord/voltha-protos/v5/go/extension/extensions_grpc.pb.go b/vendor/github.com/opencord/voltha-protos/v5/go/extension/extensions_grpc.pb.go
index 94626cc..7a9245e 100644
--- a/vendor/github.com/opencord/voltha-protos/v5/go/extension/extensions_grpc.pb.go
+++ b/vendor/github.com/opencord/voltha-protos/v5/go/extension/extensions_grpc.pb.go
@@ -14,7 +14,7 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
-// - protoc-gen-go-grpc v1.6.0
+// - protoc-gen-go-grpc v1.6.1
// - protoc v4.25.8
// source: voltha_protos/extensions.proto
diff --git a/vendor/github.com/opencord/voltha-protos/v5/go/health/health_grpc.pb.go b/vendor/github.com/opencord/voltha-protos/v5/go/health/health_grpc.pb.go
index d4b6f89..795139f 100644
--- a/vendor/github.com/opencord/voltha-protos/v5/go/health/health_grpc.pb.go
+++ b/vendor/github.com/opencord/voltha-protos/v5/go/health/health_grpc.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
-// - protoc-gen-go-grpc v1.6.0
+// - protoc-gen-go-grpc v1.6.1
// - protoc v4.25.8
// source: voltha_protos/health.proto
diff --git a/vendor/github.com/opencord/voltha-protos/v5/go/olt_inter_adapter_service/olt_inter_adapter_service_grpc.pb.go b/vendor/github.com/opencord/voltha-protos/v5/go/olt_inter_adapter_service/olt_inter_adapter_service_grpc.pb.go
index 472b828..43c3e63 100644
--- a/vendor/github.com/opencord/voltha-protos/v5/go/olt_inter_adapter_service/olt_inter_adapter_service_grpc.pb.go
+++ b/vendor/github.com/opencord/voltha-protos/v5/go/olt_inter_adapter_service/olt_inter_adapter_service_grpc.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
-// - protoc-gen-go-grpc v1.6.0
+// - protoc-gen-go-grpc v1.6.1
// - protoc v4.25.8
// source: voltha_protos/olt_inter_adapter_service.proto
diff --git a/vendor/github.com/opencord/voltha-protos/v5/go/onu_inter_adapter_service/onu_inter_adapter_service_grpc.pb.go b/vendor/github.com/opencord/voltha-protos/v5/go/onu_inter_adapter_service/onu_inter_adapter_service_grpc.pb.go
index 393563d..b93023b 100644
--- a/vendor/github.com/opencord/voltha-protos/v5/go/onu_inter_adapter_service/onu_inter_adapter_service_grpc.pb.go
+++ b/vendor/github.com/opencord/voltha-protos/v5/go/onu_inter_adapter_service/onu_inter_adapter_service_grpc.pb.go
@@ -1,6 +1,6 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
-// - protoc-gen-go-grpc v1.6.0
+// - protoc-gen-go-grpc v1.6.1
// - protoc v4.25.8
// source: voltha_protos/onu_inter_adapter_service.proto
diff --git a/vendor/github.com/opencord/voltha-protos/v5/go/openolt/openolt_grpc.pb.go b/vendor/github.com/opencord/voltha-protos/v5/go/openolt/openolt_grpc.pb.go
index c19691d..e036d88 100644
--- a/vendor/github.com/opencord/voltha-protos/v5/go/openolt/openolt_grpc.pb.go
+++ b/vendor/github.com/opencord/voltha-protos/v5/go/openolt/openolt_grpc.pb.go
@@ -14,7 +14,7 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
-// - protoc-gen-go-grpc v1.6.0
+// - protoc-gen-go-grpc v1.6.1
// - protoc v4.25.8
// source: voltha_protos/openolt.proto
diff --git a/vendor/github.com/opencord/voltha-protos/v5/go/voltha/voltha_grpc.pb.go b/vendor/github.com/opencord/voltha-protos/v5/go/voltha/voltha_grpc.pb.go
index 3f944a6..22197ae 100644
--- a/vendor/github.com/opencord/voltha-protos/v5/go/voltha/voltha_grpc.pb.go
+++ b/vendor/github.com/opencord/voltha-protos/v5/go/voltha/voltha_grpc.pb.go
@@ -5,7 +5,7 @@
// Code generated by protoc-gen-go-grpc. DO NOT EDIT.
// versions:
-// - protoc-gen-go-grpc v1.6.0
+// - protoc-gen-go-grpc v1.6.1
// - protoc v4.25.8
// source: voltha_protos/voltha.proto
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 2e14c81..f345768 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -193,8 +193,8 @@
# github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
## explicit
github.com/munnerz/goautoneg
-# github.com/opencord/voltha-protos/v5 v5.7.1
-## explicit; go 1.25.3
+# github.com/opencord/voltha-protos/v5 v5.7.3
+## explicit; go 1.25.5
github.com/opencord/voltha-protos/v5/go/adapter_service
github.com/opencord/voltha-protos/v5/go/common
github.com/opencord/voltha-protos/v5/go/core_adapter