Fix tests

controller/test/targets.go

@@ -4,8 +4,8 @@ import (
 	"net"
 	"reflect"
 
+	"code.fbi.h-da.de/danet/gosdn/forks/google/gnmi"
 	oc "code.fbi.h-da.de/danet/gosdn/models/generated/openconfig"
-	"github.com/google/gnxi/gnmi"
 	pb "github.com/openconfig/gnmi/proto/gnmi"
 	"github.com/openconfig/goyang/pkg/yang"
 	"github.com/openconfig/ygot/util"
@@ -79,8 +79,7 @@ func GnmiTarget(stop chan bool, bindAddr string) error {
 		modelData,
 		reflect.TypeOf((*oc.Device)(nil)),
 		oc.SchemaTree["Device"],
-		// oc.Unmarshal,
-		nil,
+		oc.Unmarshal,
 		oc.ΛEnum)
 
 	g := grpc.NewServer()

go.mod

@@ -4,12 +4,12 @@ go 1.18
 
 require (
 	github.com/docker/docker v20.10.11+incompatible
-	github.com/google/go-cmp v0.5.6
+	github.com/google/go-cmp v0.5.8
 	github.com/google/uuid v1.2.0
 	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.2
-	github.com/openconfig/gnmi v0.0.0-20210914185457-51254b657b7d
+	github.com/openconfig/gnmi v0.0.0-20220503232738-6eb133c65a13
 	github.com/openconfig/goyang v1.0.0
-	github.com/openconfig/ygot v0.18.1
+	github.com/openconfig/ygot v0.19.0
 	github.com/prometheus/client_golang v1.11.0
 	github.com/sirupsen/logrus v1.8.1
 	github.com/spf13/cobra v1.1.3
@@ -17,7 +17,7 @@ require (
 	github.com/stretchr/objx v0.2.0 // indirect
 	github.com/stretchr/testify v1.7.0
 	golang.org/x/sync v0.0.0-20210220032951-036812b2e83c
-	google.golang.org/grpc v1.43.0
+	google.golang.org/grpc v1.46.0
 	google.golang.org/protobuf v1.28.0
 	gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b
 )
@@ -27,15 +27,16 @@ require (
 	github.com/mitchellh/go-homedir v1.1.0
 	github.com/spf13/pflag v1.0.5
 	go.mongodb.org/mongo-driver v1.8.4
-	google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa
+	google.golang.org/genproto v0.0.0-20220505152158-f39f71e6c8f3
 )
 
 require (
 	github.com/aristanetworks/goarista v0.0.0-20220425175323-05f7c4c5e34c
-	github.com/google/gnxi v0.0.0-20220411075422-cd6b043b7fd0
 	github.com/sethvargo/go-password v0.2.0
 )
 
+require github.com/gorilla/mux v1.8.0 // indirect
+
 require (
 	github.com/Microsoft/go-winio v0.5.1 // indirect
 	github.com/Microsoft/hcsshim v0.9.2 // indirect
@@ -51,7 +52,7 @@ require (
 	github.com/go-stack/stack v1.8.0 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang-jwt/jwt v3.2.2+incompatible
-	github.com/golang/glog v1.0.0 // indirect
+	github.com/golang/glog v1.0.0
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.2
 	github.com/golang/snappy v0.0.4 // indirect
@@ -88,10 +89,9 @@ require (
 	github.com/youmark/pkcs8 v0.0.0-20181117223130-1be2e3e5546d // indirect
 	go.opencensus.io v0.23.0 // indirect
 	golang.org/x/crypto v0.0.0-20210921155107-089bfa567519 // indirect
-	golang.org/x/net v0.0.0-20211216030914-fe4d6282115f // indirect
-	golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e // indirect
+	golang.org/x/net v0.0.0-20220425223048-2871e0cb64e4
+	golang.org/x/sys v0.0.0-20220503163025-988cb79eb6c6 // indirect
 	golang.org/x/text v0.3.7 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
 	gopkg.in/ini.v1 v1.64.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )