VOL-1643 Update voltha-go to use voltha-protos and voltha-lib-go v3.0.0
Change-Id: I86744943d59de38e9285ed7f53adc49c3b047e62
diff --git a/db/model/base_test.go b/db/model/base_test.go
index 0fd9446..e9e4cac 100644
--- a/db/model/base_test.go
+++ b/db/model/base_test.go
@@ -19,8 +19,8 @@
"runtime/debug"
"sync"
- "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/log"
+ "github.com/opencord/voltha-protos/v3/go/voltha"
)
var callbackMutex sync.Mutex
diff --git a/db/model/branch.go b/db/model/branch.go
index 21669a1..2066643 100644
--- a/db/model/branch.go
+++ b/db/model/branch.go
@@ -19,7 +19,7 @@
import (
"sync"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
)
// TODO: implement weak references or something equivalent
diff --git a/db/model/child_type.go b/db/model/child_type.go
index 5928192..c238432 100644
--- a/db/model/child_type.go
+++ b/db/model/child_type.go
@@ -20,8 +20,8 @@
desc "github.com/golang/protobuf/descriptor"
"github.com/golang/protobuf/proto"
"github.com/golang/protobuf/protoc-gen-go/descriptor"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
- "github.com/opencord/voltha-protos/v2/go/common"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
+ "github.com/opencord/voltha-protos/v3/go/common"
"reflect"
"strconv"
"sync"
diff --git a/db/model/child_type_test.go b/db/model/child_type_test.go
index 3836858..5a64264 100644
--- a/db/model/child_type_test.go
+++ b/db/model/child_type_test.go
@@ -16,7 +16,7 @@
package model
import (
- "github.com/opencord/voltha-protos/v2/go/voltha"
+ "github.com/opencord/voltha-protos/v3/go/voltha"
"reflect"
"testing"
)
diff --git a/db/model/data_revision.go b/db/model/data_revision.go
index 1b1fc39..a0d5fc4 100644
--- a/db/model/data_revision.go
+++ b/db/model/data_revision.go
@@ -24,7 +24,7 @@
"reflect"
"github.com/golang/protobuf/proto"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
)
// DataRevision stores the data associated to a revision along with its calculated checksum hash value
diff --git a/db/model/data_revision_test.go b/db/model/data_revision_test.go
index 635525f..cf19d3c 100644
--- a/db/model/data_revision_test.go
+++ b/db/model/data_revision_test.go
@@ -21,9 +21,9 @@
"testing"
"github.com/golang/protobuf/ptypes/any"
- "github.com/opencord/voltha-protos/v2/go/common"
- "github.com/opencord/voltha-protos/v2/go/openflow_13"
- "github.com/opencord/voltha-protos/v2/go/voltha"
+ "github.com/opencord/voltha-protos/v3/go/common"
+ "github.com/opencord/voltha-protos/v3/go/openflow_13"
+ "github.com/opencord/voltha-protos/v3/go/voltha"
"github.com/stretchr/testify/assert"
)
diff --git a/db/model/event_bus.go b/db/model/event_bus.go
index 2a2c21e..4295c2d 100644
--- a/db/model/event_bus.go
+++ b/db/model/event_bus.go
@@ -18,9 +18,10 @@
import (
"encoding/json"
+
"github.com/golang/protobuf/proto"
- "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/log"
+ "github.com/opencord/voltha-protos/v3/go/voltha"
)
// EventBus contains the details required to communicate with the event bus mechanism
@@ -58,7 +59,7 @@
if _, ok := ignoredCallbacks[eventType]; ok {
log.Debugf("ignoring event - type:%s, data:%+v", eventType, data)
}
- var kind voltha.ConfigEventType_ConfigEventType
+ var kind voltha.ConfigEventType_Types
switch eventType {
case PostAdd:
kind = voltha.ConfigEventType_add
diff --git a/db/model/event_bus_client.go b/db/model/event_bus_client.go
index d9a8d49..e25f246 100644
--- a/db/model/event_bus_client.go
+++ b/db/model/event_bus_client.go
@@ -17,8 +17,8 @@
package model
import (
- "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/log"
+ "github.com/opencord/voltha-protos/v3/go/voltha"
)
// EventBusClient is an abstraction layer structure to communicate with an event bus mechanism
diff --git a/db/model/merge.go b/db/model/merge.go
index a1cb2db..1c9d0a5 100644
--- a/db/model/merge.go
+++ b/db/model/merge.go
@@ -17,7 +17,7 @@
package model
import (
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
)
func revisionsAreEqual(a, b []Revision) bool {
diff --git a/db/model/model.go b/db/model/model.go
index 34d2192..4c944bf 100644
--- a/db/model/model.go
+++ b/db/model/model.go
@@ -17,7 +17,7 @@
package model
import (
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
)
func init() {
diff --git a/db/model/node.go b/db/model/node.go
index 57f67d3..3bead57 100644
--- a/db/model/node.go
+++ b/db/model/node.go
@@ -28,7 +28,7 @@
"time"
"github.com/golang/protobuf/proto"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
)
// When a branch has no transaction id, everything gets stored in NONE
diff --git a/db/model/node_test.go b/db/model/node_test.go
index c54e35c..aadf21a 100644
--- a/db/model/node_test.go
+++ b/db/model/node_test.go
@@ -22,9 +22,9 @@
"testing"
"github.com/golang/protobuf/ptypes/any"
- "github.com/opencord/voltha-protos/v2/go/common"
- "github.com/opencord/voltha-protos/v2/go/openflow_13"
- "github.com/opencord/voltha-protos/v2/go/voltha"
+ "github.com/opencord/voltha-protos/v3/go/common"
+ "github.com/opencord/voltha-protos/v3/go/openflow_13"
+ "github.com/opencord/voltha-protos/v3/go/voltha"
)
var (
diff --git a/db/model/non_persisted_revision.go b/db/model/non_persisted_revision.go
index b796217..bde80b1 100644
--- a/db/model/non_persisted_revision.go
+++ b/db/model/non_persisted_revision.go
@@ -28,8 +28,8 @@
"time"
"github.com/golang/protobuf/proto"
- "github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/db/kvstore"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
)
// TODO: Cache logic will have to be revisited to cleanup unused entries in memory (disabled for now)
diff --git a/db/model/persisted_revision.go b/db/model/persisted_revision.go
index 3214054..f6309ce 100644
--- a/db/model/persisted_revision.go
+++ b/db/model/persisted_revision.go
@@ -26,9 +26,9 @@
"github.com/golang/protobuf/proto"
"github.com/google/uuid"
- "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"
+ "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"
)
// PersistedRevision holds information of revision meant to be saved in a persistent storage
diff --git a/db/model/profiling.go b/db/model/profiling.go
index 702f295..4e6f871 100644
--- a/db/model/profiling.go
+++ b/db/model/profiling.go
@@ -19,7 +19,7 @@
import (
"sync"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
)
// Profiling is used to store performance details collected at runtime
diff --git a/db/model/profiling_test.go b/db/model/profiling_test.go
index ebdd09c..968aac6 100644
--- a/db/model/profiling_test.go
+++ b/db/model/profiling_test.go
@@ -19,7 +19,7 @@
"reflect"
"testing"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
"github.com/stretchr/testify/assert"
)
diff --git a/db/model/proxy.go b/db/model/proxy.go
index f4c8bbc..e4a8e6f 100644
--- a/db/model/proxy.go
+++ b/db/model/proxy.go
@@ -27,7 +27,7 @@
"sync"
"github.com/google/uuid"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
)
// OperationContext holds details on the information used during an operation
diff --git a/db/model/proxy_load_test.go b/db/model/proxy_load_test.go
index 9c264e4..25903ed 100644
--- a/db/model/proxy_load_test.go
+++ b/db/model/proxy_load_test.go
@@ -25,10 +25,10 @@
"testing"
"github.com/google/uuid"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
- "github.com/opencord/voltha-protos/v2/go/common"
- "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/log"
+ "github.com/opencord/voltha-protos/v3/go/common"
+ "github.com/opencord/voltha-protos/v3/go/openflow_13"
+ "github.com/opencord/voltha-protos/v3/go/voltha"
"github.com/stretchr/testify/assert"
)
diff --git a/db/model/proxy_test.go b/db/model/proxy_test.go
index 77a0dea..da022e8 100644
--- a/db/model/proxy_test.go
+++ b/db/model/proxy_test.go
@@ -27,10 +27,10 @@
"github.com/golang/protobuf/proto"
"github.com/google/uuid"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
- "github.com/opencord/voltha-protos/v2/go/common"
- "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/log"
+ "github.com/opencord/voltha-protos/v3/go/common"
+ "github.com/opencord/voltha-protos/v3/go/openflow_13"
+ "github.com/opencord/voltha-protos/v3/go/voltha"
"github.com/stretchr/testify/assert"
)
diff --git a/db/model/revision.go b/db/model/revision.go
index cba06cb..f7ecaba 100644
--- a/db/model/revision.go
+++ b/db/model/revision.go
@@ -20,7 +20,7 @@
"context"
"time"
- "github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
+ "github.com/opencord/voltha-lib-go/v3/pkg/db/kvstore"
)
// Revision -
diff --git a/db/model/root.go b/db/model/root.go
index 24cfe46..0b74ddf 100644
--- a/db/model/root.go
+++ b/db/model/root.go
@@ -25,8 +25,8 @@
"github.com/golang/protobuf/proto"
"github.com/google/uuid"
- "github.com/opencord/voltha-lib-go/v2/pkg/db"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/db"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
)
// Root is used to provide an abstraction to the base root structure
diff --git a/db/model/transaction.go b/db/model/transaction.go
index f54b0d2..88be89b 100644
--- a/db/model/transaction.go
+++ b/db/model/transaction.go
@@ -20,7 +20,7 @@
"context"
"fmt"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
)
// Transaction -
diff --git a/db/model/transaction_test.go b/db/model/transaction_test.go
index ff2385a..8149722 100644
--- a/db/model/transaction_test.go
+++ b/db/model/transaction_test.go
@@ -23,9 +23,9 @@
"testing"
"github.com/google/uuid"
- "github.com/opencord/voltha-lib-go/v2/pkg/log"
- "github.com/opencord/voltha-protos/v2/go/common"
- "github.com/opencord/voltha-protos/v2/go/voltha"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
+ "github.com/opencord/voltha-protos/v3/go/common"
+ "github.com/opencord/voltha-protos/v3/go/voltha"
"github.com/stretchr/testify/assert"
)