[VOL-2941] Upgrading to latest protos and lib
Change-Id: Ie0a92172023f629744f97a7499335cef490dcc3f
diff --git a/cmd/simulated_olt/main.go b/cmd/simulated_olt/main.go
index 2245621..2166fec 100644
--- a/cmd/simulated_olt/main.go
+++ b/cmd/simulated_olt/main.go
@@ -19,15 +19,15 @@
"context"
"errors"
"fmt"
- "github.com/opencord/voltha-lib-go/v2/pkg/adapters"
- com "github.com/opencord/voltha-lib-go/v2/pkg/adapters/common"
- "github.com/opencord/voltha-lib-go/v2/pkg/db/kvstore"
- "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"
- "github.com/opencord/voltha-lib-go/v2/pkg/version"
- 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/adapters"
+ com "github.com/opencord/voltha-lib-go/v3/pkg/adapters/common"
+ "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"
+ "github.com/opencord/voltha-lib-go/v3/pkg/probe"
+ "github.com/opencord/voltha-lib-go/v3/pkg/version"
+ ic "github.com/opencord/voltha-protos/v3/go/inter_container"
+ "github.com/opencord/voltha-protos/v3/go/voltha"
ac "github.com/opencord/voltha-simolt-adapter/internal/pkg/adaptercore"
"github.com/opencord/voltha-simolt-adapter/internal/pkg/config"
"os"
@@ -43,7 +43,7 @@
iAdapter adapters.IAdapter
kafkaClient kafka.Client
kvClient kvstore.Client
- kip *kafka.InterContainerProxy
+ kip kafka.InterContainerProxy
coreProxy *com.CoreProxy
halted bool
exitChannel chan int
@@ -125,7 +125,7 @@
}
}
-func (rw *adapter) stop() {
+func (rw *adapter) stop(ctx context.Context) {
// Stop leadership tracking
rw.halted = true
@@ -135,7 +135,7 @@
// Cleanup - applies only if we had a kvClient
if rw.kvClient != nil {
// Release all reservations
- if err := rw.kvClient.ReleaseAllReservations(); err != nil {
+ if err := rw.kvClient.ReleaseAllReservations(ctx); err != nil {
log.Infow("fail-to-release-all-reservations", log.Fields{"error": err})
}
// Close the DB connection
@@ -196,19 +196,15 @@
}
}
-func (a *adapter) startInterContainerProxy(ctx context.Context, retries int) (*kafka.InterContainerProxy, error) {
+func (a *adapter) startInterContainerProxy(ctx context.Context, retries int) (kafka.InterContainerProxy, error) {
log.Infow("starting-intercontainer-messaging-proxy", log.Fields{"host": a.config.KafkaAdapterHost,
"port": a.config.KafkaAdapterPort, "topic": a.config.Topic})
var err error
- var kip *kafka.InterContainerProxy
- if kip, err = kafka.NewInterContainerProxy(
+ kip := kafka.NewInterContainerProxy(
kafka.InterContainerHost(a.config.KafkaAdapterHost),
kafka.InterContainerPort(a.config.KafkaAdapterPort),
kafka.MsgClient(a.kafkaClient),
- kafka.DefaultTopic(&kafka.Topic{Name: a.config.Topic})); err != nil {
- log.Errorw("fail-to-create-common-proxy", log.Fields{"error": err})
- return nil, err
- }
+ kafka.DefaultTopic(&kafka.Topic{Name: a.config.Topic}))
count := 0
for {
if err = kip.Start(); err != nil {
@@ -229,7 +225,7 @@
return kip, nil
}
-func (a *adapter) startSimulatedOLT(ctx context.Context, kip *kafka.InterContainerProxy, cp *com.CoreProxy, onuNumber int) (*ac.SimulatedOLT, error) {
+func (a *adapter) startSimulatedOLT(ctx context.Context, kip kafka.InterContainerProxy, cp *com.CoreProxy, onuNumber int) (*ac.SimulatedOLT, error) {
log.Info("starting-simulated-olt")
var err error
sOLT := ac.NewSimulatedOLT(ctx, a.kip, cp, onuNumber)
@@ -259,9 +255,15 @@
func (a *adapter) registerWithCore(ctx context.Context, retries int) error {
log.Info("registering-with-core")
adapterDescription := &voltha.Adapter{
- Id: "simulated_olt",
+ Id: "simulated_olt_1",
Vendor: "Open Networking Foundation",
Version: version.VersionInfo.Version,
+ Type: "simulated_olt",
+ // TODO add parameters to deploy multiple replicas
+ CurrentReplica: 1,
+ TotalReplicas: 1,
+ Endpoint: "simulated_olt",
+
}
types := []*voltha.DeviceType{{Id: "simulated_olt", Adapter: "simulated_olt", AcceptsAddRemoveFlowUpdates: true}}
deviceTypes := &voltha.DeviceTypes{Items: types}
@@ -334,9 +336,13 @@
}
//// Setup logging
+ logLevel, err := log.StringToLogLevel(cf.LogLevel)
+ if err != nil {
+ log.Fatalf("Cannot setup logging, %s", err)
+ }
//Setup default logger - applies for packages that do not have specific logger set
- if _, err := log.SetDefaultLogger(log.JSON, cf.LogLevel, log.Fields{"instanceId": cf.InstanceID}); err != nil {
+ if _, err := log.SetDefaultLogger(log.JSON, logLevel, log.Fields{"instanceId": cf.InstanceID}); err != nil {
log.With(log.Fields{"error": err}).Fatal("Cannot setup logging")
}
@@ -345,7 +351,7 @@
log.With(log.Fields{"error": err}).Fatal("Cannot setup logging")
}
- log.SetPackageLogLevel("github.com/opencord/voltha-lib-go/v2/pkg/adapters/common", log.DebugLevel)
+ log.SetPackageLogLevel("github.com/opencord/voltha-lib-go/v3/pkg/adapters/common", log.DebugLevel)
defer log.CleanUp()
@@ -372,7 +378,7 @@
log.Infow("received-a-closing-signal", log.Fields{"code": code})
// Cleanup before leaving
- ad.stop()
+ ad.stop(ctx)
elapsed := time.Since(start)
log.Infow("run-time", log.Fields{"instanceId": ad.config.InstanceID, "time": elapsed / time.Second})