[VOL-5567] Upgrade protos and remove deprecated dependencies
Change-Id: I27bd979c5a3bfa10fad5aadecaed6aa34c4ddb74
Signed-off-by: bseeniva <balaji.seenivasan@radisys.com>
diff --git a/rw_core/test/common_test.go b/rw_core/test/common_test.go
index 6974718..2ed0d0f 100644
--- a/rw_core/test/common_test.go
+++ b/rw_core/test/common_test.go
@@ -26,8 +26,8 @@
"github.com/opencord/voltha-protos/v5/go/common"
ofp "github.com/opencord/voltha-protos/v5/go/openflow_13"
- "github.com/golang/protobuf/ptypes/empty"
"github.com/opencord/voltha-protos/v5/go/voltha"
+ "google.golang.org/protobuf/types/known/emptypb"
)
var retryInterval = 50 * time.Millisecond
@@ -191,7 +191,7 @@
done := false
go func() {
for {
- devices, _ := nbi.ListDevices(getContext(), &empty.Empty{})
+ devices, _ := nbi.ListDevices(getContext(), &emptypb.Empty{})
if verificationFunction(devices) {
ch <- 1
break
@@ -219,7 +219,7 @@
done := false
go func() {
for {
- lDevices, _ := nbi.ListLogicalDevices(getContext(), &empty.Empty{})
+ lDevices, _ := nbi.ListLogicalDevices(getContext(), &emptypb.Empty{})
if verificationFunction(lDevices) {
ch <- 1
break
@@ -358,7 +358,7 @@
break
}
for {
- devices, _ := nbi.ListDevices(getContext(), &empty.Empty{})
+ devices, _ := nbi.ListDevices(getContext(), &emptypb.Empty{})
removed := devices == nil || len(devices.Items) == 0
if !removed {
removed = true
@@ -420,7 +420,7 @@
continue
}
// verifyParentDeletionOnly is False => check children as well
- devices, _ := nbi.ListDevices(getContext(), &empty.Empty{})
+ devices, _ := nbi.ListDevices(getContext(), &emptypb.Empty{})
removed := devices == nil || len(devices.Items) == 0
if !removed {
removed = true