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

qfx: Update cmd-forwarder-vpp to latest sdk-sriov #401

Merged
merged 2 commits into from
Nov 19, 2021
Merged

qfx: Update cmd-forwarder-vpp to latest sdk-sriov #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04f98c4
update to latest sdk-sriov
denis-tingaikin Nov 18, 2021
1d6dbfd
fix ci issues
denis-tingaikin Nov 18, 2021
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 @@ -15,7 +15,7 @@ require (
github.com/networkservicemesh/api v1.0.1-0.20211110183123-3038992da61a
github.com/networkservicemesh/sdk v0.5.1-0.20211117074913-f62d80574fd5
github.com/networkservicemesh/sdk-k8s v0.0.0-20211103091718-33b5af79cf03
github.com/networkservicemesh/sdk-sriov v0.0.0-20211103092011-23a720ab62a6
github.com/networkservicemesh/sdk-sriov v0.0.0-20211117213205-b1980f419277
github.com/networkservicemesh/sdk-vpp v0.0.0-20211117075440-4e4cf7f97de7
github.com/pkg/errors v0.9.1
github.com/sirupsen/logrus v1.7.0
Expand Down
5 changes: 2 additions & 3 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -355,11 +355,10 @@ github.com/networkservicemesh/sdk v0.5.1-0.20211117074913-f62d80574fd5 h1:Ef5fjr
github.com/networkservicemesh/sdk v0.5.1-0.20211117074913-f62d80574fd5/go.mod h1:9ZCaoauLu+52PLj/BXnYH5w9Pk9jdhaeMA14zb0PUxA=
github.com/networkservicemesh/sdk-k8s v0.0.0-20211103091718-33b5af79cf03 h1:zRQEYK50TYbPa3VKxNocm48kZex8v5EqVs+YThOFOb8=
github.com/networkservicemesh/sdk-k8s v0.0.0-20211103091718-33b5af79cf03/go.mod h1:00UFcAw3OeU3J6mOPUCXTwYIeraP4XbdM9DHFaGEr3I=
github.com/networkservicemesh/sdk-kernel v0.0.0-20211103091648-fc8bfe254113/go.mod h1:s9tYSINEUkCIDMPq8tNFQ2zxMwjgXEcCKfcp4gStycU=
github.com/networkservicemesh/sdk-kernel v0.0.0-20211117075134-67cd16f0d5c7 h1:p6NE8a+lMDC5n1c9WiiPmyxj/Z1y0zORfIKSeEQIOF4=
github.com/networkservicemesh/sdk-kernel v0.0.0-20211117075134-67cd16f0d5c7/go.mod h1:sOyzzsFfS7/vO4YmNahIwNFB8PDxJZHoKiwd/PmxPJ0=
github.com/networkservicemesh/sdk-sriov v0.0.0-20211103092011-23a720ab62a6 h1:WsnwJeTDbTVJc8FuCYIUt6y9QnYaRrEyH3TCycQGDRo=
github.com/networkservicemesh/sdk-sriov v0.0.0-20211103092011-23a720ab62a6/go.mod h1:Sx4W7rd93sUhpCPT92FvhDXAbbfshVcB4IX4CgTrFos=
github.com/networkservicemesh/sdk-sriov v0.0.0-20211117213205-b1980f419277 h1:FzDi+Ogpm6GMlx8AupMuiPlw8RyKYmZpg2YLJQZ6vDw=
github.com/networkservicemesh/sdk-sriov v0.0.0-20211117213205-b1980f419277/go.mod h1:3/Fucpztn8a0jBk/JIFCLBG5rjkfwrsbFeN61G1DpZY=
github.com/networkservicemesh/sdk-vpp v0.0.0-20211117075440-4e4cf7f97de7 h1:Tlrb6UcDlQvPfG7Qepg+1gfBnIArsVt8WE3+lMbSyYg=
github.com/networkservicemesh/sdk-vpp v0.0.0-20211117075440-4e4cf7f97de7/go.mod h1:ddP2P3LCQMpT8Y8iH5FkwB4td4uIaBUyfn63CealjIw=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
Expand Down
2 changes: 1 addition & 1 deletion internal/imports/imports_linux.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions internal/xconnectns/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ import (
"github.com/networkservicemesh/api/pkg/api/networkservice/mechanisms/vfio"
"github.com/networkservicemesh/api/pkg/api/networkservice/mechanisms/vxlan"
"github.com/networkservicemesh/api/pkg/api/networkservice/mechanisms/wireguard"
sriovxconnectns "github.com/networkservicemesh/sdk-sriov/pkg/networkservice/chains/xconnectns"
sriovforwarder "github.com/networkservicemesh/sdk-sriov/pkg/networkservice/chains/forwarder"
"github.com/networkservicemesh/sdk-sriov/pkg/networkservice/common/resourcepool"
sriovconfig "github.com/networkservicemesh/sdk-sriov/pkg/sriov/config"
sriovtokens "github.com/networkservicemesh/sdk-sriov/pkg/tools/tokens"
Expand Down Expand Up @@ -91,6 +91,6 @@ func NewServer(
})
},
vppForwarder,
sriovxconnectns.NewServer(ctx, name, authzServer, tokenGenerator, pciPool, resourcePool, sriovConfig, vfioDir, cgroupBaseDir, clientURL, clientDialOptions...),
sriovforwarder.NewServer(ctx, name, authzServer, tokenGenerator, pciPool, resourcePool, sriovConfig, vfioDir, cgroupBaseDir, clientURL, dialTimeout, clientDialOptions...),
)
}