From 5cd1ad7d444bb48e2aa2be66fd673799a6e8543d Mon Sep 17 00:00:00 2001 From: Artem Glazychev Date: Thu, 15 Jul 2021 21:36:23 +0700 Subject: [PATCH] Manual api update Signed-off-by: Artem Glazychev --- go.mod | 4 ++-- go.sum | 8 ++++---- .../connectioncontextkernel/ipcontext/ipaddress/common.go | 2 +- .../connectioncontextkernel/ipcontext/routes/common.go | 2 +- pkg/networkservice/connectioncontextkernel/mtu/common.go | 4 ++-- pkg/networkservice/mechanisms/kernel/kerneltap/common.go | 2 +- .../mechanisms/kernel/kernelvethpair/common.go | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/go.mod b/go.mod index cf56a603..965e7dab 100644 --- a/go.mod +++ b/go.mod @@ -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 diff --git a/go.sum b/go.sum index e4006bb6..4c5e1db6 100644 --- a/go.sum +++ b/go.sum @@ -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= diff --git a/pkg/networkservice/connectioncontextkernel/ipcontext/ipaddress/common.go b/pkg/networkservice/connectioncontextkernel/ipcontext/ipaddress/common.go index 7b4159c4..f5e902d0 100644 --- a/pkg/networkservice/connectioncontextkernel/ipcontext/ipaddress/common.go +++ b/pkg/networkservice/connectioncontextkernel/ipcontext/ipaddress/common.go @@ -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) } diff --git a/pkg/networkservice/connectioncontextkernel/ipcontext/routes/common.go b/pkg/networkservice/connectioncontextkernel/ipcontext/routes/common.go index d4fcb42c..b800439f 100644 --- a/pkg/networkservice/connectioncontextkernel/ipcontext/routes/common.go +++ b/pkg/networkservice/connectioncontextkernel/ipcontext/routes/common.go @@ -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) } diff --git a/pkg/networkservice/connectioncontextkernel/mtu/common.go b/pkg/networkservice/connectioncontextkernel/mtu/common.go index 8219c89c..1bf01cf5 100644 --- a/pkg/networkservice/connectioncontextkernel/mtu/common.go +++ b/pkg/networkservice/connectioncontextkernel/mtu/common.go @@ -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() diff --git a/pkg/networkservice/mechanisms/kernel/kerneltap/common.go b/pkg/networkservice/mechanisms/kernel/kerneltap/common.go index 740ffcf6..d211cc2c 100644 --- a/pkg/networkservice/mechanisms/kernel/kerneltap/common.go +++ b/pkg/networkservice/mechanisms/kernel/kerneltap/common.go @@ -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, diff --git a/pkg/networkservice/mechanisms/kernel/kernelvethpair/common.go b/pkg/networkservice/mechanisms/kernel/kernelvethpair/common.go index 6ad43f1c..459b83cd 100644 --- a/pkg/networkservice/mechanisms/kernel/kernelvethpair/common.go +++ b/pkg/networkservice/mechanisms/kernel/kernelvethpair/common.go @@ -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 {