VOL-1643 Update voltha-lib-go to use voltha-protos v3.0.0
and bump up the version to 3.0.0. voltha-protos is modified to be
compatible with the java language proto compilation. It's a major
change and a major version change has been made.
Change-Id: Ifb93430567ddf96aaa0fbf6e5853aad9e1070f6f
diff --git a/pkg/adapters/README.md b/pkg/adapters/README.md
deleted file mode 100644
index 13479f8..0000000
--- a/pkg/adapters/README.md
+++ /dev/null
@@ -1,10 +0,0 @@
-## How to Build and Run a Voltha Go language Adapter
-
-This directory is a repo for all voltha adapters written in Go language. At this time, the simulated_olt and
-simulated_onu adapters are the only adapters using the Go language. These adapters provide basic capabilities
-which will be used for high availability and capacity testing.
-
-### Building and running the Simulated OLT and ONU Adapters
-
-Please refer to the ```BUILD.md``` file under the voltha-go repo
-
diff --git a/pkg/adapters/adapterif/adapter_proxy_if.go b/pkg/adapters/adapterif/adapter_proxy_if.go
index 8197170..de5cfc0 100644
--- a/pkg/adapters/adapterif/adapter_proxy_if.go
+++ b/pkg/adapters/adapterif/adapter_proxy_if.go
@@ -20,7 +20,7 @@
"context"
"github.com/golang/protobuf/proto"
- ic "github.com/opencord/voltha-protos/v2/go/inter_container"
+ ic "github.com/opencord/voltha-protos/v3/go/inter_container"
)
// AdapterProxy interface for AdapterProxy implementation.
diff --git a/pkg/adapters/adapterif/core_proxy_if.go b/pkg/adapters/adapterif/core_proxy_if.go
index c7af374..dbf3418 100644
--- a/pkg/adapters/adapterif/core_proxy_if.go
+++ b/pkg/adapters/adapterif/core_proxy_if.go
@@ -19,7 +19,7 @@
import (
"context"
- "github.com/opencord/voltha-protos/v2/go/voltha"
+ "github.com/opencord/voltha-protos/v3/go/voltha"
)
// CoreProxy interface for voltha-go coreproxy.
@@ -32,10 +32,10 @@
RegisterAdapter(ctx context.Context, adapter *voltha.Adapter, deviceTypes *voltha.DeviceTypes) error
DeviceUpdate(ctx context.Context, device *voltha.Device) error
PortCreated(ctx context.Context, deviceID string, port *voltha.Port) error
- PortsStateUpdate(ctx context.Context, deviceID string, operStatus voltha.OperStatus_OperStatus) error
+ PortsStateUpdate(ctx context.Context, deviceID string, operStatus voltha.OperStatus_Types) error
DeleteAllPorts(ctx context.Context, deviceID string) error
DeviceStateUpdate(ctx context.Context, deviceID string,
- connStatus voltha.ConnectStatus_ConnectStatus, operStatus voltha.OperStatus_OperStatus) error
+ connStatus voltha.ConnectStatus_Types, operStatus voltha.OperStatus_Types) error
DevicePMConfigUpdate(ctx context.Context, pmConfigs *voltha.PmConfigs) error
ChildDeviceDetected(ctx context.Context, parentDeviceID string, parentPortNo int,
@@ -49,5 +49,5 @@
SendPacketIn(ctx context.Context, deviceID string, port uint32, pktPayload []byte) error
DeviceReasonUpdate(ctx context.Context, deviceID string, deviceReason string) error
PortStateUpdate(ctx context.Context, deviceID string, pType voltha.Port_PortType, portNo uint32,
- operStatus voltha.OperStatus_OperStatus) error
+ operStatus voltha.OperStatus_Types) error
}
diff --git a/pkg/adapters/adapterif/events_proxy_if.go b/pkg/adapters/adapterif/events_proxy_if.go
index b8ea9d8..c144935 100644
--- a/pkg/adapters/adapterif/events_proxy_if.go
+++ b/pkg/adapters/adapterif/events_proxy_if.go
@@ -17,7 +17,7 @@
package adapterif
import (
- "github.com/opencord/voltha-protos/v2/go/voltha"
+ "github.com/opencord/voltha-protos/v3/go/voltha"
)
// EventProxy interface for eventproxy
@@ -33,7 +33,7 @@
)
type (
- EventType = voltha.EventType_EventType
- EventCategory = voltha.EventCategory_EventCategory
- EventSubCategory = voltha.EventSubCategory_EventSubCategory
+ EventType = voltha.EventType_Types
+ EventCategory = voltha.EventCategory_Types
+ EventSubCategory = voltha.EventSubCategory_Types
)
diff --git a/pkg/adapters/common/adapter_proxy.go b/pkg/adapters/common/adapter_proxy.go
index 37015ad..b302214 100644
--- a/pkg/adapters/common/adapter_proxy.go
+++ b/pkg/adapters/common/adapter_proxy.go
@@ -17,14 +17,15 @@
import (
"context"
+ "time"
+
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/ptypes"
"github.com/golang/protobuf/ptypes/any"
"github.com/google/uuid"
- "github.com/opencord/voltha-lib-go/v2/pkg/kafka"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
- ic "github.com/opencord/voltha-protos/v2/go/inter_container"
- "time"
+ "github.com/opencord/voltha-lib-go/v3/pkg/kafka"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
+ ic "github.com/opencord/voltha-protos/v3/go/inter_container"
)
type AdapterProxy struct {
diff --git a/pkg/adapters/common/common.go b/pkg/adapters/common/common.go
index c4b07c2..acf818c 100644
--- a/pkg/adapters/common/common.go
+++ b/pkg/adapters/common/common.go
@@ -16,7 +16,7 @@
package common
import (
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
)
const (
diff --git a/pkg/adapters/common/core_proxy.go b/pkg/adapters/common/core_proxy.go
index 0b8a023..9b46c28 100644
--- a/pkg/adapters/common/core_proxy.go
+++ b/pkg/adapters/common/core_proxy.go
@@ -21,10 +21,10 @@
"github.com/golang/protobuf/ptypes"
a "github.com/golang/protobuf/ptypes/any"
- "github.com/opencord/voltha-lib-go/v2/pkg/kafka"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
- ic "github.com/opencord/voltha-protos/v2/go/inter_container"
- "github.com/opencord/voltha-protos/v2/go/voltha"
+ "github.com/opencord/voltha-lib-go/v3/pkg/kafka"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
+ ic "github.com/opencord/voltha-protos/v3/go/inter_container"
+ "github.com/opencord/voltha-protos/v3/go/voltha"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
@@ -153,8 +153,8 @@
return unPackResponse(rpc, deviceId, success, result)
}
-func (ap *CoreProxy) PortsStateUpdate(ctx context.Context, deviceId string, operStatus voltha.OperStatus_OperStatus) error {
- logger.Debugw("PortsStateUpdate", log.Fields{"deviceId": deviceId})
+func (ap *CoreProxy) PortsStateUpdate(ctx context.Context, deviceId string, operStatus voltha.OperStatus_Types) error {
+ log.Debugw("PortsStateUpdate", log.Fields{"deviceId": deviceId})
rpc := "PortsStateUpdate"
// Use a device specific topic to send the request. The adapter handling the device creates a device
// specific topic
@@ -201,8 +201,8 @@
}
func (ap *CoreProxy) DeviceStateUpdate(ctx context.Context, deviceId string,
- connStatus voltha.ConnectStatus_ConnectStatus, operStatus voltha.OperStatus_OperStatus) error {
- logger.Debugw("DeviceStateUpdate", log.Fields{"deviceId": deviceId})
+ connStatus voltha.ConnectStatus_Types, operStatus voltha.OperStatus_Types) error {
+ log.Debugw("DeviceStateUpdate", log.Fields{"deviceId": deviceId})
rpc := "DeviceStateUpdate"
// Use a device specific topic to send the request. The adapter handling the device creates a device
// specific topic
@@ -561,7 +561,7 @@
}
func (ap *CoreProxy) PortStateUpdate(ctx context.Context, deviceId string, pType voltha.Port_PortType, portNum uint32,
- operStatus voltha.OperStatus_OperStatus) error {
+ operStatus voltha.OperStatus_Types) error {
logger.Debugw("PortStateUpdate", log.Fields{"deviceId": deviceId, "portType": pType, "portNo": portNum, "operation_status": operStatus})
rpc := "PortStateUpdate"
// Use a device specific topic to send the request. The adapter handling the device creates a device
diff --git a/pkg/adapters/common/core_proxy_test.go b/pkg/adapters/common/core_proxy_test.go
index 08e887e..b47f43e 100644
--- a/pkg/adapters/common/core_proxy_test.go
+++ b/pkg/adapters/common/core_proxy_test.go
@@ -16,8 +16,9 @@
package common
import (
- adapterIf "github.com/opencord/voltha-lib-go/v2/pkg/adapters/adapterif"
"testing"
+
+ adapterIf "github.com/opencord/voltha-lib-go/v3/pkg/adapters/adapterif"
)
func TestCoreProxyImplementsAdapterIfCoreProxy(t *testing.T) {
diff --git a/pkg/adapters/common/events_proxy.go b/pkg/adapters/common/events_proxy.go
index ebc9423..034de8e 100644
--- a/pkg/adapters/common/events_proxy.go
+++ b/pkg/adapters/common/events_proxy.go
@@ -23,10 +23,10 @@
"strings"
"time"
- "github.com/opencord/voltha-lib-go/v2/pkg/adapters/adapterif"
- "github.com/opencord/voltha-lib-go/v2/pkg/kafka"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
- "github.com/opencord/voltha-protos/v2/go/voltha"
+ "github.com/opencord/voltha-lib-go/v3/pkg/adapters/adapterif"
+ "github.com/opencord/voltha-lib-go/v3/pkg/kafka"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
+ "github.com/opencord/voltha-protos/v3/go/voltha"
)
type EventProxy struct {
diff --git a/pkg/adapters/common/performance_metrics.go b/pkg/adapters/common/performance_metrics.go
index bcb45f8..7697c05 100644
--- a/pkg/adapters/common/performance_metrics.go
+++ b/pkg/adapters/common/performance_metrics.go
@@ -17,7 +17,7 @@
package common
import (
- "github.com/opencord/voltha-protos/v2/go/voltha"
+ "github.com/opencord/voltha-protos/v3/go/voltha"
)
type PmMetrics struct {
diff --git a/pkg/adapters/common/request_handler.go b/pkg/adapters/common/request_handler.go
index cc84ef7..414116b 100644
--- a/pkg/adapters/common/request_handler.go
+++ b/pkg/adapters/common/request_handler.go
@@ -17,15 +17,16 @@
import (
"errors"
+
"github.com/golang/protobuf/ptypes"
"github.com/golang/protobuf/ptypes/empty"
- "github.com/opencord/voltha-lib-go/v2/pkg/adapters"
- "github.com/opencord/voltha-lib-go/v2/pkg/adapters/adapterif"
- "github.com/opencord/voltha-lib-go/v2/pkg/kafka"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
- ic "github.com/opencord/voltha-protos/v2/go/inter_container"
- "github.com/opencord/voltha-protos/v2/go/openflow_13"
- "github.com/opencord/voltha-protos/v2/go/voltha"
+ "github.com/opencord/voltha-lib-go/v3/pkg/adapters"
+ "github.com/opencord/voltha-lib-go/v3/pkg/adapters/adapterif"
+ "github.com/opencord/voltha-lib-go/v3/pkg/kafka"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
+ ic "github.com/opencord/voltha-protos/v3/go/inter_container"
+ "github.com/opencord/voltha-protos/v3/go/openflow_13"
+ "github.com/opencord/voltha-protos/v3/go/voltha"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
)
diff --git a/pkg/adapters/iAdapter.go b/pkg/adapters/iAdapter.go
index 38aac38..3b86ac5 100644
--- a/pkg/adapters/iAdapter.go
+++ b/pkg/adapters/iAdapter.go
@@ -16,9 +16,9 @@
package adapters
import (
- ic "github.com/opencord/voltha-protos/v2/go/inter_container"
- "github.com/opencord/voltha-protos/v2/go/openflow_13"
- "github.com/opencord/voltha-protos/v2/go/voltha"
+ ic "github.com/opencord/voltha-protos/v3/go/inter_container"
+ "github.com/opencord/voltha-protos/v3/go/openflow_13"
+ "github.com/opencord/voltha-protos/v3/go/voltha"
)
//IAdapter represents the set of APIs a voltha adapter has to support.
diff --git a/pkg/db/backend.go b/pkg/db/backend.go
index b807253..23ad5a0 100644
--- a/pkg/db/backend.go
+++ b/pkg/db/backend.go
@@ -20,13 +20,14 @@
"context"
"errors"
"fmt"
- "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"
"strconv"
"sync"
"time"
+
+ "github.com/opencord/voltha-lib-go/v3/pkg/db/kvstore"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
+ "google.golang.org/grpc/codes"
+ "google.golang.org/grpc/status"
)
const (
diff --git a/pkg/db/backend_test.go b/pkg/db/backend_test.go
index fdd9071..8eae015 100644
--- a/pkg/db/backend_test.go
+++ b/pkg/db/backend_test.go
@@ -18,14 +18,15 @@
import (
"context"
- "github.com/opencord/voltha-lib-go/v2/pkg/mocks"
+ "os"
+ "testing"
+ "time"
+
+ "github.com/opencord/voltha-lib-go/v3/pkg/mocks"
"github.com/phayes/freeport"
"github.com/stretchr/testify/assert"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
- "os"
- "testing"
- "time"
)
const (
diff --git a/pkg/db/common.go b/pkg/db/common.go
index d6cea42..a5a79ae 100644
--- a/pkg/db/common.go
+++ b/pkg/db/common.go
@@ -16,7 +16,7 @@
package db
import (
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
)
const (
diff --git a/pkg/db/kvstore/common.go b/pkg/db/kvstore/common.go
index 212b1d1..2d2a6a6 100644
--- a/pkg/db/kvstore/common.go
+++ b/pkg/db/kvstore/common.go
@@ -16,7 +16,7 @@
package kvstore
import (
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
)
const (
diff --git a/pkg/db/kvstore/consulclient.go b/pkg/db/kvstore/consulclient.go
index fd74d43..e391293 100644
--- a/pkg/db/kvstore/consulclient.go
+++ b/pkg/db/kvstore/consulclient.go
@@ -19,7 +19,7 @@
"bytes"
"context"
"errors"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ log "github.com/opencord/voltha-lib-go/v3/pkg/log"
"sync"
"time"
//log "ciena.com/coordinator/common"
diff --git a/pkg/db/kvstore/etcdclient.go b/pkg/db/kvstore/etcdclient.go
index 234bf05..7096748 100644
--- a/pkg/db/kvstore/etcdclient.go
+++ b/pkg/db/kvstore/etcdclient.go
@@ -19,7 +19,7 @@
"context"
"errors"
"fmt"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
v3Client "go.etcd.io/etcd/clientv3"
v3Concurrency "go.etcd.io/etcd/clientv3/concurrency"
v3rpcTypes "go.etcd.io/etcd/etcdserver/api/v3rpc/rpctypes"
diff --git a/pkg/flows/common.go b/pkg/flows/common.go
index de85acf..b4fe7ec 100644
--- a/pkg/flows/common.go
+++ b/pkg/flows/common.go
@@ -16,7 +16,7 @@
package flows
import (
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
)
const (
diff --git a/pkg/flows/flow_utils.go b/pkg/flows/flow_utils.go
index d3cf74d..b9981e6 100644
--- a/pkg/flows/flow_utils.go
+++ b/pkg/flows/flow_utils.go
@@ -21,8 +21,8 @@
"fmt"
"github.com/cevaris/ordered_map"
"github.com/gogo/protobuf/proto"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
- ofp "github.com/opencord/voltha-protos/v2/go/openflow_13"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
+ ofp "github.com/opencord/voltha-protos/v3/go/openflow_13"
"math/big"
"strings"
)
diff --git a/pkg/flows/flow_utils_test.go b/pkg/flows/flow_utils_test.go
index a9dc9cc..fc2ff27 100644
--- a/pkg/flows/flow_utils_test.go
+++ b/pkg/flows/flow_utils_test.go
@@ -17,12 +17,13 @@
import (
"bytes"
- ofp "github.com/opencord/voltha-protos/v2/go/openflow_13"
+ "strings"
+ "testing"
+
+ ofp "github.com/opencord/voltha-protos/v3/go/openflow_13"
"github.com/stretchr/testify/assert"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
- "strings"
- "testing"
)
var (
diff --git a/pkg/grpc/common_test.go b/pkg/grpc/common_test.go
index ff4980a..b7151f7 100644
--- a/pkg/grpc/common_test.go
+++ b/pkg/grpc/common_test.go
@@ -16,7 +16,7 @@
package grpc
import (
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
)
const (
diff --git a/pkg/grpc/server.go b/pkg/grpc/server.go
index 7796b83..33c9b76 100644
--- a/pkg/grpc/server.go
+++ b/pkg/grpc/server.go
@@ -18,7 +18,7 @@
import (
"context"
"fmt"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/credentials"
diff --git a/pkg/kafka/client.go b/pkg/kafka/client.go
index bda7ed9..6289043 100755
--- a/pkg/kafka/client.go
+++ b/pkg/kafka/client.go
@@ -18,7 +18,7 @@
import (
"time"
- ca "github.com/opencord/voltha-protos/v2/go/inter_container"
+ ca "github.com/opencord/voltha-protos/v3/go/inter_container"
)
const (
diff --git a/pkg/kafka/common.go b/pkg/kafka/common.go
index 84a4e07..cb6acb2 100644
--- a/pkg/kafka/common.go
+++ b/pkg/kafka/common.go
@@ -16,7 +16,7 @@
package kafka
import (
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
)
const (
diff --git a/pkg/kafka/kafka_inter_container_library.go b/pkg/kafka/kafka_inter_container_library.go
index 652bdfa..042e121 100644
--- a/pkg/kafka/kafka_inter_container_library.go
+++ b/pkg/kafka/kafka_inter_container_library.go
@@ -19,16 +19,17 @@
"context"
"errors"
"fmt"
- "github.com/golang/protobuf/proto"
- "github.com/golang/protobuf/ptypes"
- "github.com/golang/protobuf/ptypes/any"
- "github.com/google/uuid"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
- ic "github.com/opencord/voltha-protos/v2/go/inter_container"
"reflect"
"strings"
"sync"
"time"
+
+ "github.com/golang/protobuf/proto"
+ "github.com/golang/protobuf/ptypes"
+ "github.com/golang/protobuf/ptypes/any"
+ "github.com/google/uuid"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
+ ic "github.com/opencord/voltha-protos/v3/go/inter_container"
)
const (
diff --git a/pkg/kafka/sarama_client.go b/pkg/kafka/sarama_client.go
index 6bc2a49..9d4ab52 100755
--- a/pkg/kafka/sarama_client.go
+++ b/pkg/kafka/sarama_client.go
@@ -19,16 +19,17 @@
"context"
"errors"
"fmt"
+ "strings"
+ "sync"
+ "time"
+
"github.com/Shopify/sarama"
scc "github.com/bsm/sarama-cluster"
"github.com/eapache/go-resiliency/breaker"
"github.com/golang/protobuf/proto"
"github.com/google/uuid"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
- ic "github.com/opencord/voltha-protos/v2/go/inter_container"
- "strings"
- "sync"
- "time"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
+ ic "github.com/opencord/voltha-protos/v3/go/inter_container"
)
type returnErrorFunction func() error
diff --git a/pkg/mocks/common.go b/pkg/mocks/common.go
index d6d4062..839ac3e 100644
--- a/pkg/mocks/common.go
+++ b/pkg/mocks/common.go
@@ -16,7 +16,7 @@
package mocks
import (
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
)
const (
diff --git a/pkg/mocks/etcd_server_test.go b/pkg/mocks/etcd_server_test.go
index 90a3654..c2efd58 100644
--- a/pkg/mocks/etcd_server_test.go
+++ b/pkg/mocks/etcd_server_test.go
@@ -18,7 +18,7 @@
import (
"fmt"
- "github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
+ "github.com/opencord/voltha-lib-go/v3/pkg/db/kvstore"
"github.com/phayes/freeport"
"github.com/stretchr/testify/assert"
"os"
diff --git a/pkg/mocks/kafka_client.go b/pkg/mocks/kafka_client.go
index 381c093..51bd532 100644
--- a/pkg/mocks/kafka_client.go
+++ b/pkg/mocks/kafka_client.go
@@ -17,12 +17,13 @@
import (
"fmt"
- "github.com/opencord/voltha-lib-go/v2/pkg/kafka"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
- ic "github.com/opencord/voltha-protos/v2/go/inter_container"
+ "sync"
+
+ "github.com/opencord/voltha-lib-go/v3/pkg/kafka"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
+ ic "github.com/opencord/voltha-protos/v3/go/inter_container"
"google.golang.org/grpc/codes"
"google.golang.org/grpc/status"
- "sync"
)
type KafkaClient struct {
diff --git a/pkg/mocks/kafka_client_test.go b/pkg/mocks/kafka_client_test.go
index f4707f6..e4517cc 100644
--- a/pkg/mocks/kafka_client_test.go
+++ b/pkg/mocks/kafka_client_test.go
@@ -17,18 +17,19 @@
package mocks
import (
- "github.com/opencord/voltha-lib-go/v2/pkg/kafka"
- ic "github.com/opencord/voltha-protos/v2/go/inter_container"
- "github.com/stretchr/testify/assert"
"testing"
"time"
+
+ "github.com/opencord/voltha-lib-go/v3/pkg/kafka"
+ ic "github.com/opencord/voltha-protos/v3/go/inter_container"
+ "github.com/stretchr/testify/assert"
)
func TestKafkaClientImplementsKafkaClientIf(t *testing.T) {
client := NewKafkaClient()
if _, ok := interface{}(client).(kafka.Client); !ok {
- t.Error("mock kafka client does not implement voltha-lib-go/v2/pkg/kafka/Client interface")
+ t.Error("mock kafka client does not implement voltha-lib-go/v3/pkg/kafka/Client interface")
}
}
diff --git a/pkg/pmmetrics/performance_metrics.go b/pkg/pmmetrics/performance_metrics.go
index 8951a7d..b5d9369 100644
--- a/pkg/pmmetrics/performance_metrics.go
+++ b/pkg/pmmetrics/performance_metrics.go
@@ -17,7 +17,7 @@
package pmmetrics
import (
- "github.com/opencord/voltha-protos/v2/go/voltha"
+ "github.com/opencord/voltha-protos/v3/go/voltha"
)
// PmMetrics structure holds metric and device info
diff --git a/pkg/ponresourcemanager/ponresourcemanager.go b/pkg/ponresourcemanager/ponresourcemanager.go
index 0abe6c1..4587675 100755
--- a/pkg/ponresourcemanager/ponresourcemanager.go
+++ b/pkg/ponresourcemanager/ponresourcemanager.go
@@ -23,11 +23,11 @@
"fmt"
"strconv"
- "github.com/boljen/go-bitmap"
- "github.com/opencord/voltha-lib-go/v2/pkg/db"
- "github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
- tp "github.com/opencord/voltha-lib-go/v2/pkg/techprofile"
+ bitmap "github.com/boljen/go-bitmap"
+ "github.com/opencord/voltha-lib-go/v3/pkg/db"
+ "github.com/opencord/voltha-lib-go/v3/pkg/db/kvstore"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
+ tp "github.com/opencord/voltha-lib-go/v3/pkg/techprofile"
)
const (
diff --git a/pkg/probe/probe.go b/pkg/probe/probe.go
index 7e6dbf9..9f00953 100644
--- a/pkg/probe/probe.go
+++ b/pkg/probe/probe.go
@@ -18,7 +18,7 @@
import (
"context"
"fmt"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
"net/http"
"sync"
)
diff --git a/pkg/probe/probe_test.go b/pkg/probe/probe_test.go
index 537bf7d..37e8013 100644
--- a/pkg/probe/probe_test.go
+++ b/pkg/probe/probe_test.go
@@ -18,7 +18,7 @@
import (
"context"
"encoding/json"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
"github.com/stretchr/testify/assert"
"io/ioutil"
"net/http"
diff --git a/pkg/techprofile/config.go b/pkg/techprofile/config.go
index b1a8ac5..2df7147 100644
--- a/pkg/techprofile/config.go
+++ b/pkg/techprofile/config.go
@@ -16,7 +16,7 @@
package techprofile
import (
- "github.com/opencord/voltha-lib-go/v2/pkg/db"
+ "github.com/opencord/voltha-lib-go/v3/pkg/db"
)
// tech profile default constants
diff --git a/pkg/techprofile/tech_profile.go b/pkg/techprofile/tech_profile.go
index 3588838..0358291 100644
--- a/pkg/techprofile/tech_profile.go
+++ b/pkg/techprofile/tech_profile.go
@@ -23,10 +23,11 @@
"regexp"
"strconv"
- "github.com/opencord/voltha-lib-go/v2/pkg/db"
- "github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
- tp_pb "github.com/opencord/voltha-protos/v2/go/tech_profile"
+ "github.com/opencord/voltha-lib-go/v3/pkg/db"
+
+ "github.com/opencord/voltha-lib-go/v3/pkg/db/kvstore"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
+ tp_pb "github.com/opencord/voltha-protos/v3/go/tech_profile"
)
// Interface to pon resource manager APIs
diff --git a/pkg/techprofile/tech_profile_if.go b/pkg/techprofile/tech_profile_if.go
index cadca87..9184b5b 100644
--- a/pkg/techprofile/tech_profile_if.go
+++ b/pkg/techprofile/tech_profile_if.go
@@ -17,8 +17,8 @@
package techprofile
import (
- "github.com/opencord/voltha-lib-go/v2/pkg/db"
- tp_pb "github.com/opencord/voltha-protos/v2/go/tech_profile"
+ "github.com/opencord/voltha-lib-go/v3/pkg/db"
+ tp_pb "github.com/opencord/voltha-protos/v3/go/tech_profile"
)
type TechProfileIf interface {