VOL-2138 Use v2 import paths for voltha-lib-go
Change-Id: I853dcce79c4defbe3140f3893651a2f50d63e053
diff --git a/tests/afrouter/suites/test2/test2.go b/tests/afrouter/suites/test2/test2.go
index 3661dce..6bf545b 100644
--- a/tests/afrouter/suites/test2/test2.go
+++ b/tests/afrouter/suites/test2/test2.go
@@ -31,7 +31,7 @@
//"encoding/json"
"text/template"
//"github.com/golang/protobuf/proto"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
//pb "github.com/golang/protobuf/protoc-gen-go/descriptor"
)
diff --git a/tests/afrouter/suites/test3/test3.go b/tests/afrouter/suites/test3/test3.go
index 0738188..f0a65c7 100644
--- a/tests/afrouter/suites/test3/test3.go
+++ b/tests/afrouter/suites/test3/test3.go
@@ -31,7 +31,7 @@
//"encoding/json"
"text/template"
//"github.com/golang/protobuf/proto"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
//pb "github.com/golang/protobuf/protoc-gen-go/descriptor"
)
diff --git a/tests/afrouter/templates/client.go.tmpl b/tests/afrouter/templates/client.go.tmpl
index ba68ed2..8543040 100644
--- a/tests/afrouter/templates/client.go.tmpl
+++ b/tests/afrouter/templates/client.go.tmpl
@@ -23,7 +23,7 @@
"google.golang.org/grpc"
"golang.org/x/net/context"
"google.golang.org/grpc/metadata"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
// Values generated by the go template
{{range .Imports}}
"{{.}}"
diff --git a/tests/afrouter/templates/main.go.tmpl b/tests/afrouter/templates/main.go.tmpl
index 5328226..5293b06 100644
--- a/tests/afrouter/templates/main.go.tmpl
+++ b/tests/afrouter/templates/main.go.tmpl
@@ -27,7 +27,7 @@
"context"
//slog "log"
//"google.golang.org/grpc/grpclog"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
)
func startSut(cmdStr string) (*exec.Cmd, context.CancelFunc, error) {
diff --git a/tests/afrouter/templates/runAll.go.tmpl b/tests/afrouter/templates/runAll.go.tmpl
index 9ad8356..a0414a2 100644
--- a/tests/afrouter/templates/runAll.go.tmpl
+++ b/tests/afrouter/templates/runAll.go.tmpl
@@ -25,7 +25,7 @@
"fmt"
"os/exec"
"io/ioutil"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
)
diff --git a/tests/afrouter/templates/runTests.go.tmpl b/tests/afrouter/templates/runTests.go.tmpl
index 9d3fdf5..5660739 100644
--- a/tests/afrouter/templates/runTests.go.tmpl
+++ b/tests/afrouter/templates/runTests.go.tmpl
@@ -26,7 +26,7 @@
"encoding/json"
//"golang.org/x/net/context"
"google.golang.org/grpc/metadata"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
{{end}}
{{range .Imports}}
{{if .Used}}
diff --git a/tests/afrouter/templates/server.go.tmpl b/tests/afrouter/templates/server.go.tmpl
index ea95a01..7ce70b0 100644
--- a/tests/afrouter/templates/server.go.tmpl
+++ b/tests/afrouter/templates/server.go.tmpl
@@ -27,7 +27,7 @@
"google.golang.org/grpc"
"golang.org/x/net/context"
"google.golang.org/grpc/metadata"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
// Values generated by the go template
{{range .Imports}}
"{{.}}"
diff --git a/tests/afrouter/templates/stats.go.tmpl b/tests/afrouter/templates/stats.go.tmpl
index be7d858..92c923c 100644
--- a/tests/afrouter/templates/stats.go.tmpl
+++ b/tests/afrouter/templates/stats.go.tmpl
@@ -26,7 +26,7 @@
"io/ioutil"
"encoding/json"
//"google.golang.org/grpc/grpclog"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
)
type TestCase struct {
diff --git a/tests/afrouter/tester.go b/tests/afrouter/tester.go
index f82745d..0e57537 100644
--- a/tests/afrouter/tester.go
+++ b/tests/afrouter/tester.go
@@ -26,7 +26,7 @@
"fmt"
"github.com/golang/protobuf/proto"
pb "github.com/golang/protobuf/protoc-gen-go/descriptor"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
"io/ioutil"
"math"
"os"
diff --git a/tests/afrouter/tester/main.go b/tests/afrouter/tester/main.go
index ce07524..e7e63fa 100644
--- a/tests/afrouter/tester/main.go
+++ b/tests/afrouter/tester/main.go
@@ -22,7 +22,7 @@
package main
import (
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
)
func main() {
diff --git a/tests/core/api/grpc_nbi_api_handler_client_test.go b/tests/core/api/grpc_nbi_api_handler_client_test.go
index f0e3534..f90427b 100644
--- a/tests/core/api/grpc_nbi_api_handler_client_test.go
+++ b/tests/core/api/grpc_nbi_api_handler_client_test.go
@@ -22,8 +22,8 @@
"context"
"fmt"
"github.com/golang/protobuf/ptypes/empty"
- com "github.com/opencord/voltha-lib-go/pkg/adapters/common"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ com "github.com/opencord/voltha-lib-go/v2/pkg/adapters/common"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
"github.com/opencord/voltha-protos/go/common"
"github.com/opencord/voltha-protos/go/openflow_13"
"github.com/opencord/voltha-protos/go/voltha"
diff --git a/tests/core/concurrency/core_concurrency_test.go b/tests/core/concurrency/core_concurrency_test.go
index 5a38e8b..47682f3 100644
--- a/tests/core/concurrency/core_concurrency_test.go
+++ b/tests/core/concurrency/core_concurrency_test.go
@@ -23,8 +23,8 @@
"fmt"
"github.com/golang/protobuf/ptypes/empty"
"github.com/google/uuid"
- com "github.com/opencord/voltha-lib-go/pkg/adapters/common"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ com "github.com/opencord/voltha-lib-go/v2/pkg/adapters/common"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
"github.com/opencord/voltha-protos/go/common"
"github.com/opencord/voltha-protos/go/voltha"
"github.com/stretchr/testify/assert"
diff --git a/tests/core/flow_management_test.go b/tests/core/flow_management_test.go
index 234eed9..dbdc0cf 100644
--- a/tests/core/flow_management_test.go
+++ b/tests/core/flow_management_test.go
@@ -23,7 +23,7 @@
"github.com/google/uuid"
fu "github.com/opencord/voltha-go/rw_core/utils"
tu "github.com/opencord/voltha-go/tests/utils"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
"github.com/opencord/voltha-protos/go/common"
ofp "github.com/opencord/voltha-protos/go/openflow_13"
"github.com/opencord/voltha-protos/go/voltha"
diff --git a/tests/core/performance_metrics_test.go b/tests/core/performance_metrics_test.go
index 94b5826..f5a19d7 100644
--- a/tests/core/performance_metrics_test.go
+++ b/tests/core/performance_metrics_test.go
@@ -22,7 +22,7 @@
"fmt"
"github.com/google/uuid"
tu "github.com/opencord/voltha-go/tests/utils"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
"github.com/opencord/voltha-protos/go/common"
"github.com/opencord/voltha-protos/go/voltha"
"github.com/stretchr/testify/assert"
diff --git a/tests/kafka/kafka_client_test.go b/tests/kafka/kafka_client_test.go
index f1ac1b4..d2c1c53 100644
--- a/tests/kafka/kafka_client_test.go
+++ b/tests/kafka/kafka_client_test.go
@@ -22,8 +22,8 @@
"github.com/golang/protobuf/ptypes"
"github.com/golang/protobuf/ptypes/any"
"github.com/google/uuid"
- kk "github.com/opencord/voltha-lib-go/pkg/kafka"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ kk "github.com/opencord/voltha-lib-go/v2/pkg/kafka"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
ic "github.com/opencord/voltha-protos/go/inter_container"
"github.com/stretchr/testify/assert"
"os"
diff --git a/tests/kafka/kafka_inter_container_messaging_test.go b/tests/kafka/kafka_inter_container_messaging_test.go
index 875d762..42670ff 100644
--- a/tests/kafka/kafka_inter_container_messaging_test.go
+++ b/tests/kafka/kafka_inter_container_messaging_test.go
@@ -22,8 +22,8 @@
"github.com/golang/protobuf/ptypes"
"github.com/google/uuid"
rhp "github.com/opencord/voltha-go/rw_core/core"
- kk "github.com/opencord/voltha-lib-go/pkg/kafka"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ kk "github.com/opencord/voltha-lib-go/v2/pkg/kafka"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
ic "github.com/opencord/voltha-protos/go/inter_container"
"github.com/opencord/voltha-protos/go/voltha"
"github.com/stretchr/testify/assert"
@@ -126,7 +126,7 @@
//
//func TestMultipleSubscribeUnsubscribe(t *testing.T) {
// // First subscribe to the specific topic
-// //log.SetPackageLogLevel("github.com/opencord/voltha-lib-go/pkg/kafka", log.DebugLevel)
+// //log.SetPackageLogLevel("github.com/opencord/voltha-lib-go/v2/pkg/kafka", log.DebugLevel)
// var err error
// var ch1 <-chan *ic.InterContainerMessage
// var ch2 <-chan *ic.InterContainerMessage
@@ -165,7 +165,7 @@
//}
func TestIncorrectAPI(t *testing.T) {
- log.SetPackageLogLevel("github.com/opencord/voltha-lib-go/pkg/kafka", log.ErrorLevel)
+ log.SetPackageLogLevel("github.com/opencord/voltha-lib-go/v2/pkg/kafka", log.ErrorLevel)
trnsId := uuid.New().String()
protoMsg := &voltha.Device{Id: trnsId}
args := make([]*kk.KVArg, 1)
diff --git a/tests/utils/test_utils.go b/tests/utils/test_utils.go
index b140c60..eeaf1dc 100644
--- a/tests/utils/test_utils.go
+++ b/tests/utils/test_utils.go
@@ -26,7 +26,7 @@
"github.com/golang/protobuf/ptypes/empty"
"github.com/google/uuid"
- com "github.com/opencord/voltha-lib-go/pkg/adapters/common"
+ com "github.com/opencord/voltha-lib-go/v2/pkg/adapters/common"
"github.com/opencord/voltha-protos/go/common"
ofp "github.com/opencord/voltha-protos/go/openflow_13"
"github.com/opencord/voltha-protos/go/voltha"