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

Manual api update #312

Merged
merged 1 commit into from
Jul 15, 2021
Merged

Manual api update #312

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
4 changes: 2 additions & 2 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ require (
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 v1.0.1-0.20210707174502-3bce416a9f33
github.com/networkservicemesh/sdk v0.5.1-0.20210714161021-f36729d40029
github.com/networkservicemesh/api v1.0.1-0.20210715134717-6e4a0f8eae3e
github.com/networkservicemesh/sdk v0.5.1-0.20210715135313-7f2c944e1f2b
github.com/pkg/errors v0.9.1
github.com/stretchr/testify v1.7.0
github.com/thanhpk/randstr v1.0.4
Expand Down
8 changes: 4 additions & 4 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,10 +135,10 @@ github.com/nats-io/nkeys v0.1.0/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxzi
github.com/nats-io/nkeys v0.1.3/go.mod h1:xpnFELMwJABBLVhffcfd1MZx6VsNRFpEugbxziKVo7w=
github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
github.com/nats-io/stan.go v0.6.0/go.mod h1:eIcD5bi3pqbHT/xIIvXMwvzXYElgouBvaVRftaE+eac=
github.com/networkservicemesh/api v1.0.1-0.20210707174502-3bce416a9f33 h1:jBCwRQUVHVjKCiv9JYhtSyF0YorVMQ17Tnyllt1HcRw=
github.com/networkservicemesh/api v1.0.1-0.20210707174502-3bce416a9f33/go.mod h1:B6meq/SWjWR6bGXZdXPfbOeaBK+T1JayLdtEJQCsXKU=
github.com/networkservicemesh/sdk v0.5.1-0.20210714161021-f36729d40029 h1:rdH7U/ZA7+wvkPw0oAzW/auxxi5Xes2JesiLibPjzgo=
github.com/networkservicemesh/sdk v0.5.1-0.20210714161021-f36729d40029/go.mod h1:Yg/NZAvRkvWjwkBviBsnylXf/GSx3F632KYvHfRhdQE=
github.com/networkservicemesh/api v1.0.1-0.20210715134717-6e4a0f8eae3e h1:cCRjV+1sOuOrCF/0IPXH2PJ1y7hEbuqX9k+OFnU7xhU=
github.com/networkservicemesh/api v1.0.1-0.20210715134717-6e4a0f8eae3e/go.mod h1:B6meq/SWjWR6bGXZdXPfbOeaBK+T1JayLdtEJQCsXKU=
github.com/networkservicemesh/sdk v0.5.1-0.20210715135313-7f2c944e1f2b h1:PY42nRcY0g1f7PMCLdBQmscumSm6HyRJPSzNfFWKzJY=
github.com/networkservicemesh/sdk v0.5.1-0.20210715135313-7f2c944e1f2b/go.mod h1:7whufn2CIGBX+KW3U5b0IWB6f7bJJizY1vV1a5t2HXI=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
github.com/olekukonko/tablewriter v0.0.1/go.mod h1:vsDQFd/mU46D+Z4whnwzcISnGGzXWMclvtLoiIKAKIo=
Expand Down
2 changes: 1 addition & 1 deletion pkg/networkservice/connectioncontextkernel/ipcontext/ipaddress/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ func create(ctx context.Context, conn *networkservice.Connection, isClient bool)
}
defer handle.Delete()

l, err := handle.LinkByName(mechanism.GetInterfaceName(conn))
l, err := handle.LinkByName(mechanism.GetInterfaceName())
if err != nil {
return errors.WithStack(err)
}
Expand Down
2 changes: 1 addition & 1 deletion pkg/networkservice/connectioncontextkernel/ipcontext/routes/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ func create(ctx context.Context, conn *networkservice.Connection, isClient bool)
}
defer handle.Delete()

l, err := handle.LinkByName(mechanism.GetInterfaceName(conn))
l, err := handle.LinkByName(mechanism.GetInterfaceName())
if err != nil {
return errors.WithStack(err)
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/networkservice/connectioncontextkernel/mtu/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ func setMTU(ctx context.Context, conn *networkservice.Connection) error {
}
defer handle.Delete()

l, err := handle.LinkByName(mechanism.GetInterfaceName(conn))
l, err := handle.LinkByName(mechanism.GetInterfaceName())
if err != nil {
return errors.Wrapf(err, "error attempting to retrieve link %q", mechanism.GetInterfaceName(conn))
return errors.Wrapf(err, "error attempting to retrieve link %q", mechanism.GetInterfaceName())
}

now := time.Now()
Expand Down
2 changes: 1 addition & 1 deletion pkg/networkservice/mechanisms/kernel/kerneltap/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func create(ctx context.Context, conn *networkservice.Connection, vppConn api.Co
TxRingSz: 1024,
RxRingSz: 1024,
HostIfNameSet: true,
HostIfName: mechanism.GetInterfaceName(conn),
HostIfName: mechanism.GetInterfaceName(),
HostNamespaceSet: true,
HostNamespace: nsFilename,
TapFlags: tapv2.TAP_API_FLAG_TUN,
Expand Down
2 changes: 1 addition & 1 deletion pkg/networkservice/mechanisms/kernel/kernelvethpair/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ func create(ctx context.Context, conn *networkservice.Connection, isClient bool)
WithField("link.Name", name).
WithField("netlink", "LinkByName").Debug("completed")

name = mechanism.GetInterfaceName(conn)
name = mechanism.GetInterfaceName()
// Set the LinkName
now = time.Now()
if err = handle.LinkSetName(l, name); err != nil {
Expand Down