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

Jump to bottom

Incorrect interface names in vl3 example. #336

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Incorrect interface names in vl3 example. #336

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 .golangci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ linters-settings:
dupl:
threshold: 150
funlen:
Lines: 300
Lines: 350
Statements: 125
goconst:
min-len: 2
Expand Down
1 change: 1 addition & 0 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ require (
github.com/edwarnicke/log v1.0.0 // indirect
github.com/edwarnicke/serialize v1.0.7 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/ftrvxmtrx/fd v0.0.0-20150925145434-c6d800382fff // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-jose/go-jose/v3 v3.0.3 // indirect
github.com/go-logr/logr v1.3.0 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8
github.com/foxcpp/go-mockdns v0.0.0-20210729171921-fb145fc6f897 h1:E52jfcE64UG42SwLmrW0QByONfGynWuzBvm86BoB9z8=
github.com/fsnotify/fsnotify v1.7.0 h1:8JEhPFa5W2WU7YfeZzPNqzMP6Lwt7L2715Ggo0nosvA=
github.com/fsnotify/fsnotify v1.7.0/go.mod h1:40Bi/Hjc2AVfZrqy+aj+yEI+/bRxZnMJyTJwOpGvigM=
github.com/ftrvxmtrx/fd v0.0.0-20150925145434-c6d800382fff h1:zk1wwii7uXmI0znwU+lqg+wFL9G5+vm5I+9rv2let60=
github.com/ftrvxmtrx/fd v0.0.0-20150925145434-c6d800382fff/go.mod h1:yUhRXHewUVJ1k89wHKP68xfzk7kwXUx/DV1nx4EBMbw=
github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
github.com/ghodss/yaml v1.0.0/go.mod h1:4dBDuWmgqj2HViK6kFavaiC9ZROes6MMH2rRYeMEF04=
github.com/go-jose/go-jose/v3 v3.0.3 h1:fFKWeig/irsp7XD2zBxvnmA/XaRWp5V3CBsZXJF7G7k=
Expand Down
12 changes: 10 additions & 2 deletions main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ import (

"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/loopback"
"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/mechanisms/memif"
"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/metrics"
"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/up"
"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/vrf"
"github.com/networkservicemesh/sdk/pkg/ipam/strictvl3ipam"
Expand Down Expand Up @@ -77,6 +78,7 @@ import (

"github.com/networkservicemesh/api/pkg/api/ipam"
"github.com/networkservicemesh/api/pkg/api/networkservice"
kernelmech "github.com/networkservicemesh/api/pkg/api/networkservice/mechanisms/kernel"
"github.com/networkservicemesh/api/pkg/api/networkservice/payload"
registryapi "github.com/networkservicemesh/api/pkg/api/registry"
"github.com/networkservicemesh/sdk-vpp/pkg/networkservice/tag"
Expand Down Expand Up @@ -321,7 +323,9 @@ func main() {
clientAdditionalFunctionality,
clientinfo.NewClient(),
kernelsdk.NewClient(),
sendfd.NewClient(),
mechanisms.NewClient(map[string]networkservice.NetworkServiceClient{
kernelmech.MECHANISM: sendfd.NewClient(),
}),
)...,
),
client.WithDialTimeout(config.DialTimeout),
Expand Down Expand Up @@ -551,8 +555,11 @@ func createVl3Client(ctx context.Context, config *Config, vppConn vpphelper.Conn
routes.NewClient(vppConn),
unnumbered.NewClient(vppConn, loopback.Load),
vrf.NewClient(vppConn, vrfOpts...),
metrics.NewClient(ctx, vppConn),
memif.NewClient(ctx, vppConn),
sendfd.NewClient(),
mechanisms.NewClient(map[string]networkservice.NetworkServiceClient{
memif.MECHANISM: sendfd.NewClient(),
}),
recvfd.NewClient(),
)...,
),
Expand Down Expand Up @@ -592,6 +599,7 @@ func createVl3Endpoint(ctx context.Context, cancel context.CancelFunc, config *C
unnumbered.NewServer(vppConn, loopback.Load),
vrf.NewServer(vppConn, vrfOpts...),
loopback.NewServer(vppConn, loopOpts...),
metrics.NewServer(ctx, vppConn),
mechanisms.NewServer(map[string]networkservice.NetworkServiceServer{
memif.MECHANISM: chain.NewNetworkServiceServer(
sendfd.NewServer(),
Expand Down
Loading