Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move pinhole to after the mechanism chain elements in both client and server. #265

Merged
merged 1 commit into from
Jun 14, 2021
Merged

Move pinhole to after the mechanism chain elements in both client and server. #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ go 1.16

require (
git.fd.io/govpp.git v0.3.6-0.20210202134006-4c1cccf48cd1
github.com/edwarnicke/govpp v0.0.0-20210225052125-79125273957c
github.com/edwarnicke/govpp v0.0.0-20210613224216-90cfa3213b00
github.com/golang/protobuf v1.4.3
github.com/hashicorp/go-multierror v1.0.0
github.com/networkservicemesh/api v0.0.0-20210609080649-aa4a0cc6c9ea
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,8 @@ github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs
github.com/dgrijalva/jwt-go v3.2.0+incompatible h1:7qlOGliEKZXTDg6OTjfoBKDXWrumCAMpl/TFQ4/5kLM=
github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
github.com/edwarnicke/exechelper v1.0.2/go.mod h1:/T271jtNX/ND4De6pa2aRy2+8sNtyCDB1A2pp4M+fUs=
github.com/edwarnicke/govpp v0.0.0-20210225052125-79125273957c h1:Q9PEO4AHpwvd9Yd+WtA79h1NA1UpUl19WUMiUAF99i4=
github.com/edwarnicke/govpp v0.0.0-20210225052125-79125273957c/go.mod h1:+J/hMuJr9nxWWHG+JJqhl+jpE4H97jO0tpvsaxSYEdU=
github.com/edwarnicke/govpp v0.0.0-20210613224216-90cfa3213b00 h1:lbJYLHK/wiPcipTEn9/zpa33/lvVnpTvDkjzMCvuxac=
github.com/edwarnicke/govpp v0.0.0-20210613224216-90cfa3213b00/go.mod h1:+J/hMuJr9nxWWHG+JJqhl+jpE4H97jO0tpvsaxSYEdU=
github.com/edwarnicke/grpcfd v0.1.0 h1:f0lmmNDYawQaW+dMNoF8d4DxwPxxczNSFuvu5C7ptRk=
github.com/edwarnicke/grpcfd v0.1.0/go.mod h1:rHihB9YvNMixz8rS+ZbwosI2kj65VLkeyYAI2M+/cGA=
github.com/edwarnicke/serialize v0.0.0-20200705214914-ebc43080eecf/go.mod h1:XvbCO/QGsl3X8RzjBMoRpkm54FIAZH5ChK2j+aox7pw=
Expand Down
4 changes: 2 additions & 2 deletions pkg/networkservice/chains/xconnectns/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,12 @@ func NewServer(ctx context.Context, name string, authzServer networkservice.Netw
connectioncontextkernel.NewServer(),
tag.NewServer(ctx, vppConn),
mtu.NewServer(vppConn),
pinhole.NewServer(vppConn),
mechanisms.NewServer(map[string]networkservice.NetworkServiceServer{
memif.MECHANISM: memif.NewServer(vppConn),
kernel.MECHANISM: kernel.NewServer(vppConn),
vxlan.MECHANISM: vxlan.NewServer(vppConn, tunnelIP),
}),
pinhole.NewServer(vppConn),
connect.NewServer(
ctx,
client.NewClientFactory(
Expand All @@ -95,11 +95,11 @@ func NewServer(ctx context.Context, name string, authzServer networkservice.Netw
stats.NewClient(ctx),
mtu.NewClient(vppConn),
tag.NewClient(ctx, vppConn),
pinhole.NewClient(vppConn),
// mechanisms
memif.NewClient(vppConn),
kernel.NewClient(vppConn),
vxlan.NewClient(vppConn, tunnelIP),
pinhole.NewClient(vppConn),
recvfd.NewClient(),
sendfd.NewClient()),
),
Expand Down