VOL-2154 : Moving back db/model to voltha-go repo
- Package imports and dockerfiles updated
- Left backend.go in voltha-lib-go
Amendments:
- Adjusted proto imports in unit tests
- Adjusted references to db/model in unit tests
- Integrate voltha-lib-go updates
Change-Id: I2d168c516a238222f0371a7bcb672d2b06796838
diff --git a/rw_core/core/adapter_manager.go b/rw_core/core/adapter_manager.go
index ee8f783..37c1259 100644
--- a/rw_core/core/adapter_manager.go
+++ b/rw_core/core/adapter_manager.go
@@ -20,7 +20,7 @@
"errors"
"fmt"
"github.com/gogo/protobuf/proto"
- "github.com/opencord/voltha-lib-go/v2/pkg/db/model"
+ "github.com/opencord/voltha-go/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/v2/go/voltha"
diff --git a/rw_core/core/adapter_request_handler.go b/rw_core/core/adapter_request_handler.go
index d0cd47d..f1f17c8 100644
--- a/rw_core/core/adapter_request_handler.go
+++ b/rw_core/core/adapter_request_handler.go
@@ -19,8 +19,8 @@
"errors"
"github.com/golang/protobuf/ptypes"
"github.com/golang/protobuf/ptypes/empty"
+ "github.com/opencord/voltha-go/db/model"
"github.com/opencord/voltha-go/rw_core/utils"
- "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/v2/go/inter_container"
diff --git a/rw_core/core/core.go b/rw_core/core/core.go
index ee0bd76..e340a29 100644
--- a/rw_core/core/core.go
+++ b/rw_core/core/core.go
@@ -17,9 +17,10 @@
import (
"context"
+ "github.com/opencord/voltha-go/db/model"
"github.com/opencord/voltha-go/rw_core/config"
+ "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/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"
@@ -63,7 +64,7 @@
core.kafkaClient = kafkaClient
// Setup the KV store
- backend := model.Backend{
+ backend := db.Backend{
Client: kvClient,
StoreType: cf.KVStoreType,
Host: cf.KVStoreHost,
diff --git a/rw_core/core/device_agent.go b/rw_core/core/device_agent.go
index 5b6a7f9..3d356ec 100755
--- a/rw_core/core/device_agent.go
+++ b/rw_core/core/device_agent.go
@@ -23,8 +23,8 @@
"time"
"github.com/gogo/protobuf/proto"
+ "github.com/opencord/voltha-go/db/model"
coreutils "github.com/opencord/voltha-go/rw_core/utils"
- "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/v2/go/inter_container"
diff --git a/rw_core/core/device_manager.go b/rw_core/core/device_manager.go
index 845542f..2a03dd4 100755
--- a/rw_core/core/device_manager.go
+++ b/rw_core/core/device_manager.go
@@ -18,8 +18,8 @@
import (
"context"
"errors"
+ "github.com/opencord/voltha-go/db/model"
"github.com/opencord/voltha-go/rw_core/utils"
- "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"
diff --git a/rw_core/core/logical_device_agent.go b/rw_core/core/logical_device_agent.go
index d83c8e4..1bdfc1c 100644
--- a/rw_core/core/logical_device_agent.go
+++ b/rw_core/core/logical_device_agent.go
@@ -20,10 +20,10 @@
"errors"
"fmt"
"github.com/gogo/protobuf/proto"
+ "github.com/opencord/voltha-go/db/model"
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/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/v2/go/inter_container"
diff --git a/rw_core/core/logical_device_manager.go b/rw_core/core/logical_device_manager.go
index 0126ca7..0331ecb 100644
--- a/rw_core/core/logical_device_manager.go
+++ b/rw_core/core/logical_device_manager.go
@@ -18,7 +18,7 @@
import (
"context"
"errors"
- "github.com/opencord/voltha-lib-go/v2/pkg/db/model"
+ "github.com/opencord/voltha-go/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"
diff --git a/rw_core/core/transaction.go b/rw_core/core/transaction.go
index 697e811..4ce00f9 100644
--- a/rw_core/core/transaction.go
+++ b/rw_core/core/transaction.go
@@ -296,14 +296,14 @@
// Stop monitoring the key (applies only when there has been no transaction switch over)
if c.monitorCh != nil {
close(c.monitorCh)
- ctx.kvClient.Put(c.txnKey, TRANSACTION_COMPLETE, ctx.kvOperationTimeout, false)
+ ctx.kvClient.Put(c.txnKey, TRANSACTION_COMPLETE, ctx.kvOperationTimeout)
}
return nil
}
func (c *KVTransaction) Delete() error {
log.Debugw("delete", log.Fields{"txn": c.txnId})
- return ctx.kvClient.Delete(c.txnKey, ctx.kvOperationTimeout, false)
+ return ctx.kvClient.Delete(c.txnKey, ctx.kvOperationTimeout)
}
// holdOnToTxnUntilProcessingCompleted renews the transaction lease until the transaction is complete. durationInSecs