[VOL-4290] Voltha go library updates for gRPC migration
Change-Id: I1aa2774beb6b7ed7419bc45aeb53fcae8a8ecda0
diff --git a/pkg/mocks/etcd/common.go b/pkg/mocks/etcd/common.go
index 0276357..c893312 100644
--- a/pkg/mocks/etcd/common.go
+++ b/pkg/mocks/etcd/common.go
@@ -16,7 +16,7 @@
package etcd
import (
- "github.com/opencord/voltha-lib-go/v6/pkg/log"
+ "github.com/opencord/voltha-lib-go/v7/pkg/log"
)
var logger log.CLogger
diff --git a/pkg/mocks/etcd/etcd_server.go b/pkg/mocks/etcd/etcd_server.go
index 6113b3a..951baa9 100644
--- a/pkg/mocks/etcd/etcd_server.go
+++ b/pkg/mocks/etcd/etcd_server.go
@@ -18,10 +18,12 @@
import (
"context"
"fmt"
- "go.etcd.io/etcd/embed"
"net/url"
"os"
+ "strings"
"time"
+
+ "go.etcd.io/etcd/embed"
)
const (
@@ -56,11 +58,15 @@
cfg := embed.NewConfig()
cfg.Name = configName
cfg.Dir = localPersistentStorageDir
- cfg.Logger = "zap"
+ // cfg.Logger = "zap"
if !islogLevelValid(logLevel) {
logger.Fatalf(ctx, "Invalid log level -%s", logLevel)
}
- cfg.LogLevel = logLevel
+ // cfg.LogLevel = logLevel
+ cfg.Debug = strings.EqualFold(logLevel, "debug")
+ cfg.LogPkgLevels = "*=C"
+ cfg.SetupLogging()
+
acurl, err := url.Parse(fmt.Sprintf("http://localhost:%d", clientPort))
if err != nil {
logger.Fatalf(ctx, "Invalid client port -%d", clientPort)
@@ -84,9 +90,10 @@
//getDefaultCfg specifies the default config
func getDefaultCfg() *embed.Config {
cfg := embed.NewConfig()
+ cfg.Debug = false
+ cfg.LogPkgLevels = "*=C"
+ cfg.SetupLogging()
cfg.Dir = defaultLocalPersistentStorage
- cfg.Logger = "zap"
- cfg.LogLevel = "error"
return cfg
}
diff --git a/pkg/mocks/etcd/etcd_server_test.go b/pkg/mocks/etcd/etcd_server_test.go
index 15837bc..2d39dd1 100644
--- a/pkg/mocks/etcd/etcd_server_test.go
+++ b/pkg/mocks/etcd/etcd_server_test.go
@@ -19,13 +19,14 @@
import (
"context"
"fmt"
- "github.com/opencord/voltha-lib-go/v6/pkg/db/kvstore"
- "github.com/opencord/voltha-lib-go/v6/pkg/log"
- "github.com/phayes/freeport"
- "github.com/stretchr/testify/assert"
"os"
"testing"
"time"
+
+ "github.com/opencord/voltha-lib-go/v7/pkg/db/kvstore"
+ "github.com/opencord/voltha-lib-go/v7/pkg/log"
+ "github.com/phayes/freeport"
+ "github.com/stretchr/testify/assert"
)
var etcdServer *EtcdServer