[VOL-4291] Rw-core updates for gRPC migration
Change-Id: I8d5a554409115b29318089671ca4e1ab3fa98810
diff --git a/rw_core/route/common.go b/rw_core/route/common.go
index cd85979..3bc0e5c 100644
--- a/rw_core/route/common.go
+++ b/rw_core/route/common.go
@@ -18,7 +18,7 @@
package route
import (
- "github.com/opencord/voltha-lib-go/v5/pkg/log"
+ "github.com/opencord/voltha-lib-go/v7/pkg/log"
)
var logger log.CLogger
diff --git a/rw_core/route/device_route.go b/rw_core/route/device_route.go
index dc9921f..ecb4670 100644
--- a/rw_core/route/device_route.go
+++ b/rw_core/route/device_route.go
@@ -22,8 +22,8 @@
"fmt"
"sync"
- "github.com/opencord/voltha-lib-go/v5/pkg/log"
- "github.com/opencord/voltha-protos/v4/go/voltha"
+ "github.com/opencord/voltha-lib-go/v7/pkg/log"
+ "github.com/opencord/voltha-protos/v5/go/voltha"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
@@ -120,6 +120,10 @@
}
+func (dr *DeviceRoutes) RemoveRoutes() {
+ dr.reset()
+}
+
//ComputeRoutes calculates all the routes between the logical ports. This will clear up any existing route
func (dr *DeviceRoutes) ComputeRoutes(ctx context.Context, lps map[uint32]*voltha.LogicalPort) error {
dr.routeBuildLock.Lock()
diff --git a/rw_core/route/device_route_test.go b/rw_core/route/device_route_test.go
index 04623db..2ee4718 100644
--- a/rw_core/route/device_route_test.go
+++ b/rw_core/route/device_route_test.go
@@ -26,8 +26,8 @@
"testing"
"time"
- "github.com/opencord/voltha-protos/v4/go/openflow_13"
- "github.com/opencord/voltha-protos/v4/go/voltha"
+ "github.com/opencord/voltha-protos/v5/go/openflow_13"
+ "github.com/opencord/voltha-protos/v5/go/voltha"
"github.com/stretchr/testify/assert"
)