Merge pull request #65 from edwarnicke/reverse

Fixes for networkservicemesh/sdk-vpp#156
networkservicemesh · Apr 13, 2021 · c758c04 · c758c04
2 parents 4de1efd + 41e305b
commit c758c04
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/internal/imports/gen.go b/internal/imports/gen.go
@@ -16,5 +16,5 @@
 
 package imports
 
-//go:generate bash -c "cd $(mktemp -d) && GO111MODULE=on go get github.com/edwarnicke/[email protected].1"
+//go:generate bash -c "cd $(mktemp -d) && GO111MODULE=on go get github.com/edwarnicke/[email protected].2"
 //go:generate bash -c "GOOS=linux ${GOPATH}/bin/imports-gen"
diff --git a/internal/imports/imports_linux.go b/internal/imports/imports_linux.go
diff --git a/main.go b/main.go
@@ -50,7 +50,6 @@ import (
 	"github.com/networkservicemesh/sdk/pkg/networkservice/common/mechanisms/sendfd"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/core/chain"
 	"github.com/networkservicemesh/sdk/pkg/networkservice/ipam/point2pointipam"
-	"github.com/networkservicemesh/sdk/pkg/networkservice/utils/metadata"
 	registryrefresh "github.com/networkservicemesh/sdk/pkg/registry/common/refresh"
 	registrysendfd "github.com/networkservicemesh/sdk/pkg/registry/common/sendfd"
 	registrychain "github.com/networkservicemesh/sdk/pkg/registry/core/chain"
@@ -170,15 +169,14 @@ func main() {
 			point2pointipam.NewServer(ipnet),
 			mechanisms.NewServer(map[string]networkservice.NetworkServiceServer{
 				memif.MECHANISM: chain.NewNetworkServiceServer(
-					metadata.NewServer(),
-					memif.NewServer(vppConn),
-					tag.NewServer(ctx, vppConn),
-					connectioncontext.NewServer(vppConn),
-					up.NewServer(ctx, vppConn),
 					sendfd.NewServer(),
+					up.NewServer(ctx, vppConn),
+					connectioncontext.NewServer(vppConn),
+					tag.NewServer(ctx, vppConn),
+					memif.NewServer(vppConn),
 				),
 			}),
-			sendfd.NewServer()),
+		),
 	)
 	// ********************************************************************************
 	log.FromContext(ctx).Infof("executing phase 5: create grpc server and register icmp-server")