Skip to content
Snippets Groups Projects
Commit e5679b7b authored by Malte Bauch's avatar Malte Bauch
Browse files

Create dispatcher within NewGnmiTarget func

parent 83826202
No related branches found
No related tags found
No related merge requests found
Pipeline #164431 passed
...@@ -43,7 +43,6 @@ import ( ...@@ -43,7 +43,6 @@ import (
"code.fbi.h-da.de/danet/gnmi-target/examples/example01/handlers/system" "code.fbi.h-da.de/danet/gnmi-target/examples/example01/handlers/system"
gnmitargetygot "code.fbi.h-da.de/danet/gnmi-target/examples/example01/model" gnmitargetygot "code.fbi.h-da.de/danet/gnmi-target/examples/example01/model"
"code.fbi.h-da.de/danet/gnmi-target/handler" "code.fbi.h-da.de/danet/gnmi-target/handler"
not "code.fbi.h-da.de/danet/gnmi-target/internal/notifications"
"github.com/sirupsen/logrus" "github.com/sirupsen/logrus"
"github.com/spf13/cobra" "github.com/spf13/cobra"
"github.com/spf13/viper" "github.com/spf13/viper"
...@@ -104,8 +103,6 @@ var startCmd = &cobra.Command{ ...@@ -104,8 +103,6 @@ var startCmd = &cobra.Command{
logrus.Fatal(err) logrus.Fatal(err)
} }
changeDispatcher := not.NewDispatcher()
// The registered path handlers sorted by priority. If specific // The registered path handlers sorted by priority. If specific
// handlers should be able to process their workload before others, // handlers should be able to process their workload before others,
// then they should be placed in the front of the slice. // then they should be placed in the front of the slice.
...@@ -123,7 +120,7 @@ var startCmd = &cobra.Command{ ...@@ -123,7 +120,7 @@ var startCmd = &cobra.Command{
danet.NewAssignForwardingHandler(qkdnClient), danet.NewAssignForwardingHandler(qkdnClient),
} }
gnmitTarget := gnmitarget.NewGnmiTarget(schema, &gnmitargetygot.Gnmitarget{}, gnmitargetygot.ΓModelData, gnmitargetygot.Unmarshal, gnmitargetygot.ΛEnum, changeDispatcher, handlers...) gnmitTarget := gnmitarget.NewGnmiTarget(schema, &gnmitargetygot.Gnmitarget{}, gnmitargetygot.ΓModelData, gnmitargetygot.Unmarshal, gnmitargetygot.ΛEnum, handlers...)
if err := gnmitTarget.Start(viper.GetString("bindAddress"), viper.GetString("certFile"), viper.GetString("keyFile"), viper.GetString("caFile"), *insecure); err != nil { if err := gnmitTarget.Start(viper.GetString("bindAddress"), viper.GetString("certFile"), viper.GetString("keyFile"), viper.GetString("caFile"), *insecure); err != nil {
logrus.Fatal(err) logrus.Fatal(err)
} }
......
...@@ -43,7 +43,6 @@ func NewGnmiTarget( ...@@ -43,7 +43,6 @@ func NewGnmiTarget(
modeldata []*pbGNMI.ModelData, modeldata []*pbGNMI.ModelData,
unmarshalFn func(data []byte, destStruct ygot.GoStruct, opts ...ytypes.UnmarshalOpt) error, unmarshalFn func(data []byte, destStruct ygot.GoStruct, opts ...ytypes.UnmarshalOpt) error,
ΛEnum map[string]map[int64]ygot.EnumDefinition, ΛEnum map[string]map[int64]ygot.EnumDefinition,
changeDispatcher *not.Dispatcher,
yangHandlers ...handler.PathHandler, yangHandlers ...handler.PathHandler,
) *GnmiTarget { ) *GnmiTarget {
return &GnmiTarget{ return &GnmiTarget{
...@@ -52,7 +51,7 @@ func NewGnmiTarget( ...@@ -52,7 +51,7 @@ func NewGnmiTarget(
modeldata: modeldata, modeldata: modeldata,
unmarshalFn: unmarshalFn, unmarshalFn: unmarshalFn,
ΛEnum: ΛEnum, ΛEnum: ΛEnum,
YangModelChangeDispatcher: changeDispatcher, YangModelChangeDispatcher: not.NewDispatcher(),
yangHandlers: yangHandlers, yangHandlers: yangHandlers,
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment