VOL-2138 Use v2 import paths for voltha-lib-go
Change-Id: I853dcce79c4defbe3140f3893651a2f50d63e053
diff --git a/rw_core/config/config.go b/rw_core/config/config.go
index deae0f3..87f26c3 100644
--- a/rw_core/config/config.go
+++ b/rw_core/config/config.go
@@ -18,7 +18,7 @@
import (
"flag"
"fmt"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
)
// RW Core service default constants
diff --git a/rw_core/core/adapter_manager.go b/rw_core/core/adapter_manager.go
index 5f2423e..3273001 100644
--- a/rw_core/core/adapter_manager.go
+++ b/rw_core/core/adapter_manager.go
@@ -20,9 +20,9 @@
"errors"
"fmt"
"github.com/gogo/protobuf/proto"
- "github.com/opencord/voltha-lib-go/pkg/db/model"
- "github.com/opencord/voltha-lib-go/pkg/log"
- "github.com/opencord/voltha-lib-go/pkg/probe"
+ "github.com/opencord/voltha-lib-go/v2/pkg/db/model"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/probe"
"github.com/opencord/voltha-protos/go/voltha"
"reflect"
"sync"
diff --git a/rw_core/core/adapter_proxy.go b/rw_core/core/adapter_proxy.go
index 57fa197..12e27d5 100755
--- a/rw_core/core/adapter_proxy.go
+++ b/rw_core/core/adapter_proxy.go
@@ -19,8 +19,8 @@
"context"
"github.com/golang/protobuf/ptypes"
a "github.com/golang/protobuf/ptypes/any"
- "github.com/opencord/voltha-lib-go/pkg/kafka"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "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/openflow_13"
"github.com/opencord/voltha-protos/go/voltha"
diff --git a/rw_core/core/adapter_request_handler.go b/rw_core/core/adapter_request_handler.go
index 168e9ca..c5e421f 100644
--- a/rw_core/core/adapter_request_handler.go
+++ b/rw_core/core/adapter_request_handler.go
@@ -20,9 +20,9 @@
"github.com/golang/protobuf/ptypes"
"github.com/golang/protobuf/ptypes/empty"
"github.com/opencord/voltha-go/rw_core/utils"
- "github.com/opencord/voltha-lib-go/pkg/db/model"
- "github.com/opencord/voltha-lib-go/pkg/kafka"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/db/model"
+ "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"
"google.golang.org/grpc/codes"
diff --git a/rw_core/core/core.go b/rw_core/core/core.go
index 438d645..4e04d50 100644
--- a/rw_core/core/core.go
+++ b/rw_core/core/core.go
@@ -18,12 +18,12 @@
import (
"context"
"github.com/opencord/voltha-go/rw_core/config"
- "github.com/opencord/voltha-lib-go/pkg/db/kvstore"
- "github.com/opencord/voltha-lib-go/pkg/db/model"
- grpcserver "github.com/opencord/voltha-lib-go/pkg/grpc"
- "github.com/opencord/voltha-lib-go/pkg/kafka"
- "github.com/opencord/voltha-lib-go/pkg/log"
- "github.com/opencord/voltha-lib-go/pkg/probe"
+ "github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
+ "github.com/opencord/voltha-lib-go/v2/pkg/db/model"
+ grpcserver "github.com/opencord/voltha-lib-go/v2/pkg/grpc"
+ "github.com/opencord/voltha-lib-go/v2/pkg/kafka"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/probe"
"github.com/opencord/voltha-protos/go/voltha"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
diff --git a/rw_core/core/device_agent.go b/rw_core/core/device_agent.go
index c8e07a9..6921612 100755
--- a/rw_core/core/device_agent.go
+++ b/rw_core/core/device_agent.go
@@ -20,9 +20,9 @@
"fmt"
"github.com/gogo/protobuf/proto"
coreutils "github.com/opencord/voltha-go/rw_core/utils"
- "github.com/opencord/voltha-lib-go/pkg/db/model"
- fu "github.com/opencord/voltha-lib-go/pkg/flows"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/db/model"
+ fu "github.com/opencord/voltha-lib-go/v2/pkg/flows"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
ic "github.com/opencord/voltha-protos/go/inter_container"
ofp "github.com/opencord/voltha-protos/go/openflow_13"
"github.com/opencord/voltha-protos/go/voltha"
diff --git a/rw_core/core/device_manager.go b/rw_core/core/device_manager.go
index 9434dcf..d9aa5ea 100755
--- a/rw_core/core/device_manager.go
+++ b/rw_core/core/device_manager.go
@@ -19,10 +19,10 @@
"context"
"errors"
"github.com/opencord/voltha-go/rw_core/utils"
- "github.com/opencord/voltha-lib-go/pkg/db/model"
- "github.com/opencord/voltha-lib-go/pkg/kafka"
- "github.com/opencord/voltha-lib-go/pkg/log"
- "github.com/opencord/voltha-lib-go/pkg/probe"
+ "github.com/opencord/voltha-lib-go/v2/pkg/db/model"
+ "github.com/opencord/voltha-lib-go/v2/pkg/kafka"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/probe"
ic "github.com/opencord/voltha-protos/go/inter_container"
ofp "github.com/opencord/voltha-protos/go/openflow_13"
"github.com/opencord/voltha-protos/go/voltha"
diff --git a/rw_core/core/device_ownership.go b/rw_core/core/device_ownership.go
index 53aaa5c..731a54c 100644
--- a/rw_core/core/device_ownership.go
+++ b/rw_core/core/device_ownership.go
@@ -19,8 +19,8 @@
"context"
"fmt"
"github.com/opencord/voltha-go/rw_core/utils"
- "github.com/opencord/voltha-lib-go/pkg/db/kvstore"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
"github.com/opencord/voltha-protos/go/voltha"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
diff --git a/rw_core/core/device_state_transitions.go b/rw_core/core/device_state_transitions.go
index 0c6fc7c..dc10464 100644
--- a/rw_core/core/device_state_transitions.go
+++ b/rw_core/core/device_state_transitions.go
@@ -17,7 +17,7 @@
import (
"github.com/opencord/voltha-go/rw_core/coreIf"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
"github.com/opencord/voltha-protos/go/voltha"
)
diff --git a/rw_core/core/device_state_transitions_test.go b/rw_core/core/device_state_transitions_test.go
index b76b64a..f4106c9 100644
--- a/rw_core/core/device_state_transitions_test.go
+++ b/rw_core/core/device_state_transitions_test.go
@@ -17,7 +17,7 @@
import (
"github.com/opencord/voltha-go/rw_core/coreIf"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
"github.com/opencord/voltha-protos/go/voltha"
"github.com/stretchr/testify/assert"
"reflect"
diff --git a/rw_core/core/grpc_nbi_api_handler.go b/rw_core/core/grpc_nbi_api_handler.go
index 44520c4..e97956a 100755
--- a/rw_core/core/grpc_nbi_api_handler.go
+++ b/rw_core/core/grpc_nbi_api_handler.go
@@ -21,7 +21,7 @@
"github.com/golang/protobuf/ptypes/empty"
da "github.com/opencord/voltha-go/common/core/northbound/grpc"
"github.com/opencord/voltha-go/rw_core/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/omci"
"github.com/opencord/voltha-protos/go/openflow_13"
diff --git a/rw_core/core/logical_device_agent.go b/rw_core/core/logical_device_agent.go
index c36e1a2..bf30cc5 100644
--- a/rw_core/core/logical_device_agent.go
+++ b/rw_core/core/logical_device_agent.go
@@ -23,9 +23,9 @@
fd "github.com/opencord/voltha-go/rw_core/flow_decomposition"
"github.com/opencord/voltha-go/rw_core/graph"
coreutils "github.com/opencord/voltha-go/rw_core/utils"
- "github.com/opencord/voltha-lib-go/pkg/db/model"
- fu "github.com/opencord/voltha-lib-go/pkg/flows"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/db/model"
+ fu "github.com/opencord/voltha-lib-go/v2/pkg/flows"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
ic "github.com/opencord/voltha-protos/go/inter_container"
ofp "github.com/opencord/voltha-protos/go/openflow_13"
"github.com/opencord/voltha-protos/go/voltha"
diff --git a/rw_core/core/logical_device_manager.go b/rw_core/core/logical_device_manager.go
index 035d366..b957d59 100644
--- a/rw_core/core/logical_device_manager.go
+++ b/rw_core/core/logical_device_manager.go
@@ -18,10 +18,10 @@
import (
"context"
"errors"
- "github.com/opencord/voltha-lib-go/pkg/db/model"
- "github.com/opencord/voltha-lib-go/pkg/kafka"
- "github.com/opencord/voltha-lib-go/pkg/log"
- "github.com/opencord/voltha-lib-go/pkg/probe"
+ "github.com/opencord/voltha-lib-go/v2/pkg/db/model"
+ "github.com/opencord/voltha-lib-go/v2/pkg/kafka"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/probe"
"github.com/opencord/voltha-protos/go/openflow_13"
"github.com/opencord/voltha-protos/go/voltha"
"google.golang.org/grpc/codes"
diff --git a/rw_core/core/transaction.go b/rw_core/core/transaction.go
index b607973..fb3c765 100644
--- a/rw_core/core/transaction.go
+++ b/rw_core/core/transaction.go
@@ -29,8 +29,8 @@
package core
import (
- "github.com/opencord/voltha-lib-go/pkg/db/kvstore"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
"time"
diff --git a/rw_core/flow_decomposition/flow_decomposer.go b/rw_core/flow_decomposition/flow_decomposer.go
index ff9225c..0fd2c39 100644
--- a/rw_core/flow_decomposition/flow_decomposer.go
+++ b/rw_core/flow_decomposition/flow_decomposer.go
@@ -20,8 +20,8 @@
"github.com/gogo/protobuf/proto"
"github.com/opencord/voltha-go/rw_core/coreIf"
"github.com/opencord/voltha-go/rw_core/graph"
- fu "github.com/opencord/voltha-lib-go/pkg/flows"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ fu "github.com/opencord/voltha-lib-go/v2/pkg/flows"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
ofp "github.com/opencord/voltha-protos/go/openflow_13"
"github.com/opencord/voltha-protos/go/voltha"
)
diff --git a/rw_core/flow_decomposition/flow_decomposer_test.go b/rw_core/flow_decomposition/flow_decomposer_test.go
index 37faa25..d8a5309 100644
--- a/rw_core/flow_decomposition/flow_decomposer_test.go
+++ b/rw_core/flow_decomposition/flow_decomposer_test.go
@@ -18,8 +18,8 @@
import (
"errors"
"github.com/opencord/voltha-go/rw_core/graph"
- fu "github.com/opencord/voltha-lib-go/pkg/flows"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ fu "github.com/opencord/voltha-lib-go/v2/pkg/flows"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
ofp "github.com/opencord/voltha-protos/go/openflow_13"
"github.com/opencord/voltha-protos/go/voltha"
"github.com/stretchr/testify/assert"
diff --git a/rw_core/graph/device_graph.go b/rw_core/graph/device_graph.go
index 5bfaf96..aa08a6c 100644
--- a/rw_core/graph/device_graph.go
+++ b/rw_core/graph/device_graph.go
@@ -20,7 +20,7 @@
"errors"
"fmt"
"github.com/gyuho/goraph"
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
"github.com/opencord/voltha-protos/go/voltha"
"strconv"
"strings"
diff --git a/rw_core/main.go b/rw_core/main.go
index 09c72f4..9fc23cf 100644
--- a/rw_core/main.go
+++ b/rw_core/main.go
@@ -22,12 +22,12 @@
"github.com/opencord/voltha-go/rw_core/config"
c "github.com/opencord/voltha-go/rw_core/core"
"github.com/opencord/voltha-go/rw_core/utils"
- "github.com/opencord/voltha-lib-go/pkg/db/kvstore"
- grpcserver "github.com/opencord/voltha-lib-go/pkg/grpc"
- "github.com/opencord/voltha-lib-go/pkg/kafka"
- "github.com/opencord/voltha-lib-go/pkg/log"
- "github.com/opencord/voltha-lib-go/pkg/probe"
- "github.com/opencord/voltha-lib-go/pkg/version"
+ "github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
+ grpcserver "github.com/opencord/voltha-lib-go/v2/pkg/grpc"
+ "github.com/opencord/voltha-lib-go/v2/pkg/kafka"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/probe"
+ "github.com/opencord/voltha-lib-go/v2/pkg/version"
ic "github.com/opencord/voltha-protos/go/inter_container"
"os"
"os/signal"
diff --git a/rw_core/utils/core_utils_test.go b/rw_core/utils/core_utils_test.go
index 27d24a1..e0d0e75 100644
--- a/rw_core/utils/core_utils_test.go
+++ b/rw_core/utils/core_utils_test.go
@@ -16,7 +16,7 @@
package utils
import (
- "github.com/opencord/voltha-lib-go/pkg/log"
+ "github.com/opencord/voltha-lib-go/v2/pkg/log"
"github.com/stretchr/testify/assert"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"