VOL-2861 replace uint64 kafka interadapter timestamps with timestamp proto
Change-Id: I7bf9abbdb590ac193b1d769f46cddc01b0ac2efb
diff --git a/rw_core/core/adapter/manager.go b/rw_core/core/adapter/manager.go
index 015e32d..08c0e04 100644
--- a/rw_core/core/adapter/manager.go
+++ b/rw_core/core/adapter/manager.go
@@ -119,13 +119,13 @@
return nil
}
-func (aMgr *Manager) updateLastAdapterCommunication(adapterID string, timestamp int64) {
+func (aMgr *Manager) updateLastAdapterCommunication(adapterID string, timestamp time.Time) {
aMgr.lockAdaptersMap.RLock()
adapterAgent, have := aMgr.adapterAgents[adapterID]
aMgr.lockAdaptersMap.RUnlock()
if have {
- adapterAgent.updateCommunicationTime(time.Unix(timestamp/1000, timestamp%1000*1000))
+ adapterAgent.updateCommunicationTime(timestamp)
}
}
diff --git a/rw_core/core/api/common_test.go b/rw_core/core/api/common_test.go
index f6f07f5..f9bb047 100644
--- a/rw_core/core/api/common_test.go
+++ b/rw_core/core/api/common_test.go
@@ -99,7 +99,7 @@
func setupKVClient(cf *config.RWCoreFlags, coreInstanceID string) kvstore.Client {
addr := cf.KVStoreHost + ":" + strconv.Itoa(cf.KVStorePort)
- client, err := kvstore.NewEtcdClient(addr, cf.KVStoreTimeout)
+ client, err := kvstore.NewEtcdClient(addr, cf.KVStoreTimeout, log.FatalLevel)
if err != nil {
panic("no kv client")
}
diff --git a/rw_core/core/device/agent_test.go b/rw_core/core/device/agent_test.go
index ce69599..60b7273 100755
--- a/rw_core/core/device/agent_test.go
+++ b/rw_core/core/device/agent_test.go
@@ -25,6 +25,7 @@
"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/kafka"
+ "github.com/opencord/voltha-lib-go/v3/pkg/log"
mock_etcd "github.com/opencord/voltha-lib-go/v3/pkg/mocks/etcd"
mock_kafka "github.com/opencord/voltha-lib-go/v3/pkg/mocks/kafka"
ofp "github.com/opencord/voltha-protos/v3/go/openflow_13"
@@ -198,7 +199,7 @@
func setupKVClient(cf *config.RWCoreFlags, coreInstanceID string) kvstore.Client {
addr := cf.KVStoreHost + ":" + strconv.Itoa(cf.KVStorePort)
- client, err := kvstore.NewEtcdClient(addr, cf.KVStoreTimeout)
+ client, err := kvstore.NewEtcdClient(addr, cf.KVStoreTimeout, log.FatalLevel)
if err != nil {
panic("no kv client")
}
diff --git a/rw_core/main.go b/rw_core/main.go
index 32af37a..4d99fbb 100644
--- a/rw_core/main.go
+++ b/rw_core/main.go
@@ -57,7 +57,7 @@
case "consul":
return kvstore.NewConsulClient(address, timeout)
case "etcd":
- return kvstore.NewEtcdClient(address, timeout)
+ return kvstore.NewEtcdClient(address, timeout, log.FatalLevel)
}
return nil, errors.New("unsupported-kv-store")
}