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

Update from update/networkservicemesh/sdk #837

Merged
merged 1 commit into from
Jul 5, 2024
Merged

Update from update/networkservicemesh/sdk #837

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 @@ -11,7 +11,7 @@ require (
github.com/hashicorp/go-multierror v1.1.1
github.com/networkservicemesh/api v1.13.1-0.20240424210452-d0df98851760
github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba
github.com/networkservicemesh/sdk v0.5.1-0.20240703140424-21369bd95508
github.com/networkservicemesh/sdk v0.5.1-0.20240703140602-34ab19f2a884
github.com/networkservicemesh/sdk-kernel v0.0.0-20240703140903-a1d011810cb9
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.8.4
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 @@ -118,8 +118,8 @@ github.com/networkservicemesh/api v1.13.1-0.20240424210452-d0df98851760 h1:EaWGg
github.com/networkservicemesh/api v1.13.1-0.20240424210452-d0df98851760/go.mod h1:B8FmS3XZ7NZY7ZEtdcNg2NHYppDHlr4kl4eecdZN9eI=
github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba h1:7B6X6N7rwJNpnfsUlBavxuZdYqTx8nAKwxVS/AkuX1o=
github.com/networkservicemesh/govpp v0.0.0-20240328101142-8a444680fbba/go.mod h1:CwikXQ3p/y3j6+HbQQWXKv0f4LPyUd2vKTiViG93qWA=
github.com/networkservicemesh/sdk v0.5.1-0.20240703140424-21369bd95508 h1:m7dFb0nigIkTuE1KYf48b9k5Glb5SDhan+Ew5TpvMUc=
github.com/networkservicemesh/sdk v0.5.1-0.20240703140424-21369bd95508/go.mod h1:soFR6Mg5LTVvEI0zXNcbWoBnn4hqUK7ItZBQJ3Jbszo=
github.com/networkservicemesh/sdk v0.5.1-0.20240703140602-34ab19f2a884 h1:kuhTBsGk3Zm6AVjaPOiBaYdQYseHzSc0WCmJZHz+IAk=
github.com/networkservicemesh/sdk v0.5.1-0.20240703140602-34ab19f2a884/go.mod h1:soFR6Mg5LTVvEI0zXNcbWoBnn4hqUK7ItZBQJ3Jbszo=
github.com/networkservicemesh/sdk-kernel v0.0.0-20240703140903-a1d011810cb9 h1:8dY0Wzir/deeUhkqT2oKFJfVSVL+jGOqdl5nzpNwThw=
github.com/networkservicemesh/sdk-kernel v0.0.0-20240703140903-a1d011810cb9/go.mod h1:H1psQgdnov8Ka7PEEgpjk6T2NZhz7v+ZKU+pKU2w/Wg=
github.com/onsi/gomega v1.30.0 h1:hvMK7xYz4D3HapigLTeGdId/NcfQx1VHMJc60ew99+8=
Expand Down
4 changes: 2 additions & 2 deletions pkg/networkservice/mechanisms/kernel/kernelvethpair/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,11 @@ func create(ctx context.Context, conn *networkservice.Connection, isClient bool)

// Create the veth pair
la := netlink.NewLinkAttrs()
la.Name, err = nanoid.GenerateLinuxInterfaceName()
la.Name, err = nanoid.GenerateLinuxInterfaceName(conn.GetNetworkService())
if err != nil {
return err
}
peerName, err := nanoid.GenerateLinuxInterfaceName()
peerName, err := nanoid.GenerateLinuxInterfaceName(conn.GetNetworkService())
if err != nil {
return err
}
Expand Down
Loading