Skip to content

Commit 227c99a

Browse files
ljkiralyljkiraly
committed
Add wrapper to ovs command runner functions for logging
Signed-off-by: Laszlo Kiraly <laszlo.kiraly@est.tech>
1 parent e5da7f7 commit 227c99a

10 files changed

Lines changed: 121 additions & 57 deletions

File tree

‎pkg/networkservice/l2ovsconnect/local.go‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// Copyright (c) 2021 Nordix Foundation.
1+
// Copyright (c) 2021-2024 Nordix Foundation.
22
//
3-
// Copyright (c) 2023 Cisco and/or its affiliates.
3+
// Copyright (c) 2023-2024 Cisco and/or its affiliates.
44
//
55
// SPDX-License-Identifier: Apache-2.0
66
//
@@ -22,10 +22,10 @@ import (
2222
"fmt"
2323

2424
"github.com/networkservicemesh/sdk/pkg/tools/log"
25-
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"
2625
"github.com/pkg/errors"
2726

2827
"github.com/networkservicemesh/sdk-ovs/pkg/tools/ifnames"
28+
"github.com/networkservicemesh/sdk-ovs/pkg/tools/utils"
2929
)
3030

3131
func createLocalCrossConnect(logger log.Logger, bridgeName string, endpointOvsPortInfo,
@@ -44,7 +44,8 @@ func createLocalCrossConnect(logger log.Logger, bridgeName string, endpointOvsPo
4444
ofRuleToEndpoint = fmt.Sprintf("priority=100,in_port=%d,"+
4545
"actions=output:%d", clientOvsPortInfo.PortNo, endpointOvsPortInfo.PortNo)
4646
}
47-
stdout, stderr, err := util.RunOVSOfctl("add-flow", "-OOpenflow13", bridgeName, ofRuleToClient)
47+
w := &utils.OVSRunWrapper{Logger: logger}
48+
stdout, stderr, err := w.RunOVSOfctl("add-flow", "-OOpenflow13", bridgeName, ofRuleToClient)
4849
if err != nil {
4950
logger.Infof("Failed to add flow on %s for port %s stdout: %s"+
5051
" stderr: %s, error: %v", bridgeName, endpointOvsPortInfo.PortName, stdout, stderr, err)
@@ -55,7 +56,7 @@ func createLocalCrossConnect(logger log.Logger, bridgeName string, endpointOvsPo
5556
" stderr: %s", bridgeName, endpointOvsPortInfo.PortName, stdout, stderr)
5657
}
5758

58-
stdout, stderr, err = util.RunOVSOfctl("add-flow", "-OOpenflow13", bridgeName, ofRuleToEndpoint)
59+
stdout, stderr, err = w.RunOVSOfctl("add-flow", "-OOpenflow13", bridgeName, ofRuleToEndpoint)
5960
if err != nil {
6061
logger.Errorf("Failed to add flow on %s for port %s stdout: %s"+
6162
" stderr: %s, error: %v", bridgeName, clientOvsPortInfo.PortName, stdout, stderr, err)
@@ -81,14 +82,15 @@ func deleteLocalCrossConnect(logger log.Logger, bridgeName string, endpointOvsPo
8182
} else {
8283
matchForEndpoint = fmt.Sprintf("in_port=%d", endpointOvsPortInfo.PortNo)
8384
}
84-
stdout, stderr, err := util.RunOVSOfctl("del-flows", "-OOpenflow13", bridgeName, matchForEndpoint)
85+
w := &utils.OVSRunWrapper{Logger: logger}
86+
stdout, stderr, err := w.RunOVSOfctl("del-flows", "-OOpenflow13", bridgeName, matchForEndpoint)
8587
if err != nil {
8688
logger.Errorf("Failed to delete flow on %s for port "+
8789
"%s, stdout: %q, stderr: %q, error: %v", bridgeName, endpointOvsPortInfo.PortName, stdout, stderr, err)
8890
return errors.Wrapf(err, "failed to delete flow on %s for port %s, stdout: %q, stderr: %q", bridgeName, endpointOvsPortInfo.PortName, stdout, stderr)
8991
}
9092

91-
stdout, stderr, err = util.RunOVSOfctl("del-flows", "-OOpenflow13", bridgeName, fmt.Sprintf("in_port=%d", clientOvsPortInfo.PortNo))
93+
stdout, stderr, err = w.RunOVSOfctl("del-flows", "-OOpenflow13", bridgeName, fmt.Sprintf("in_port=%d", clientOvsPortInfo.PortNo))
9294
if err != nil {
9395
logger.Errorf("Failed to delete flow on %s for port "+
9496
"%s, stdout: %q, stderr: %q, error: %v", bridgeName, clientOvsPortInfo.PortName, stdout, stderr, err)

‎pkg/networkservice/l2ovsconnect/remote.go‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// Copyright (c) 2021 Nordix Foundation.
1+
// Copyright (c) 2021-2024 Nordix Foundation.
22
//
3-
// Copyright (c) 2023 Cisco and/or its affiliates.
3+
// Copyright (c) 2023-2024 Cisco and/or its affiliates.
44
//
55
// SPDX-License-Identifier: Apache-2.0
66
//
@@ -22,10 +22,10 @@ import (
2222
"fmt"
2323

2424
"github.com/networkservicemesh/sdk/pkg/tools/log"
25-
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"
2625
"github.com/pkg/errors"
2726

2827
"github.com/networkservicemesh/sdk-ovs/pkg/tools/ifnames"
28+
"github.com/networkservicemesh/sdk-ovs/pkg/tools/utils"
2929
)
3030

3131
func createRemoteCrossConnect(logger log.Logger, bridgeName string, endpointOvsPortInfo, clientOvsPortInfo *ifnames.OvsPortInfo) error {
@@ -60,7 +60,8 @@ func createRemoteCrossConnect(logger log.Logger, bridgeName string, endpointOvsP
6060
ovsLocalPortNum, vni, ovsTunnelPortNum)
6161
ofRuleTo = fmt.Sprintf("priority=100,in_port=%d,tun_id=%d,actions=output:%d", ovsTunnelPortNum, vni, ovsLocalPortNum)
6262
}
63-
stdout, stderr, err := util.RunOVSOfctl("add-flow", "-OOpenflow13", bridgeName, ofRuleFrom)
63+
w := &utils.OVSRunWrapper{Logger: logger}
64+
stdout, stderr, err := w.RunOVSOfctl("add-flow", "-OOpenflow13", bridgeName, ofRuleFrom)
6465
if err != nil {
6566
logger.Errorf("Failed to add flow on %s for port %s stdout: %s"+
6667
" stderr: %s, error: %v", bridgeName, ovsLocalPort, stdout, stderr, err)
@@ -70,14 +71,12 @@ func createRemoteCrossConnect(logger log.Logger, bridgeName string, endpointOvsP
7071
logger.Errorf("Failed to add flow on %s for port %s stdout: %s"+
7172
" stderr: %s", bridgeName, ovsLocalPort, stdout, stderr)
7273
}
73-
74-
stdout, stderr, err = util.RunOVSOfctl("add-flow", "-OOpenflow13", bridgeName, ofRuleTo)
74+
stdout, stderr, err = w.RunOVSOfctl("add-flow", "-OOpenflow13", bridgeName, ofRuleTo)
7575
if err != nil {
7676
logger.Errorf("Failed to add tunnel flow on %s for port %s stdout: %s"+
7777
" stderr: %s, error: %v", bridgeName, ovsTunnelPort, stdout, stderr, err)
7878
return errors.Wrapf(err, "failed to add tunnel flow on %s for port %s stdout: %s, stderr: %s", bridgeName, ovsTunnelPort, stdout, stderr)
7979
}
80-
8180
if stderr != "" {
8281
logger.Errorf("Failed to add tunnel flow on %s for port %s stdout: %s"+
8382
" stderr: %s", bridgeName, ovsTunnelPort, stdout, stderr)
@@ -110,19 +109,19 @@ func deleteRemoteCrossConnect(logger log.Logger, bridgeName string, endpointOvsP
110109
vni = clientOvsPortInfo.VNI
111110
}
112111
var ofMatch string
112+
w := &utils.OVSRunWrapper{Logger: logger}
113113
if vlanID > 0 {
114114
ofMatch = fmt.Sprintf("in_port=%d,dl_vlan=%d", ovsLocalPortNum, vlanID)
115115
} else {
116116
ofMatch = fmt.Sprintf("in_port=%d", ovsLocalPortNum)
117117
}
118-
stdout, stderr, err := util.RunOVSOfctl("del-flows", "-OOpenflow13", bridgeName, ofMatch)
118+
stdout, stderr, err := w.RunOVSOfctl("del-flows", "-OOpenflow13", bridgeName, ofMatch)
119119
if err != nil {
120120
logger.Errorf("Failed to delete flow on %s for port "+
121121
"%s, stdout: %q, stderr: %q, error: %v", bridgeName, ovsLocalPort, stdout, stderr, err)
122122
return errors.Wrapf(err, "Failed to delete flow on %s for port %s, stdout: %q, stderr: %q", bridgeName, ovsLocalPort, stdout, stderr)
123123
}
124-
125-
stdout, stderr, err = util.RunOVSOfctl("del-flows", "-OOpenflow13", bridgeName, fmt.Sprintf("in_port=%d,tun_id=%d", ovsTunnelPortNum, vni))
124+
stdout, stderr, err = w.RunOVSOfctl("del-flows", "-OOpenflow13", bridgeName, fmt.Sprintf("in_port=%d,tun_id=%d", ovsTunnelPortNum, vni))
126125
if err != nil {
127126
logger.Errorf("Failed to delete flow on %s for port "+
128127
"%s on VNI %d, stdout: %q, stderr: %q, error: %v", bridgeName, ovsTunnelPort, vni, stdout, stderr, err)

‎pkg/networkservice/mechanisms/kernel/common.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// Copyright (c) 2021-2022 Nordix Foundation.
1+
// Copyright (c) 2021-2024 Nordix Foundation.
22
//
3-
// Copyright (c) 2023 Cisco and/or its affiliates.
3+
// Copyright (c) 2023-2024 Cisco and/or its affiliates.
44
//
55
// SPDX-License-Identifier: Apache-2.0
66
//
@@ -30,7 +30,6 @@ import (
3030
"github.com/networkservicemesh/api/pkg/api/networkservice/mechanisms/kernel"
3131
"github.com/networkservicemesh/sdk-kernel/pkg/kernel/networkservice/vfconfig"
3232
"github.com/networkservicemesh/sdk/pkg/tools/log"
33-
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"
3433
"github.com/pkg/errors"
3534
"github.com/vishvananda/netlink"
3635

@@ -87,7 +86,8 @@ func setupVeth(ctx context.Context, logger log.Logger, conn *networkservice.Conn
8786
}
8887

8988
if _, exists := parentIfRefCountMap[hostIfName]; !exists {
90-
stdout, stderr, err := util.RunOVSVsctl("--", "--may-exist", "add-port", bridgeName, hostIfName)
89+
w := &ovsutil.OVSRunWrapper{Logger: logger}
90+
stdout, stderr, err := w.RunOVSVsctl("--", "--may-exist", "add-port", bridgeName, hostIfName)
9191
if err != nil {
9292
logger.Errorf("Failed to add port %s to %s, stdout: %q, stderr: %q,"+
9393
" error: %v", hostIfName, bridgeName, stdout, stderr, err)
@@ -145,8 +145,9 @@ func resetVeth(ctx context.Context, logger log.Logger, conn *networkservice.Conn
145145

146146
if refCount == 0 {
147147
if !isL2Connect {
148+
w := &ovsutil.OVSRunWrapper{Logger: logger}
148149
/* delete the port from ovs bridge and this op is valid only for p2p OF ports */
149-
stdout, stderr, err := util.RunOVSVsctl("del-port", bridgeName, ifaceName)
150+
stdout, stderr, err := w.RunOVSVsctl("del-port", bridgeName, ifaceName)
150151
if err != nil {
151152
logger.Errorf("Failed to delete port %s from %s, stdout: %q, stderr: %q,"+
152153
" error: %v", ifaceName, bridgeName, stdout, stderr, err)

‎pkg/networkservice/mechanisms/kernel/sriov.go‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// Copyright (c) 2021-2022 Nordix Foundation.
1+
// Copyright (c) 2021-2024 Nordix Foundation.
22
//
3-
// Copyright (c) 2023 Cisco and/or its affiliates.
3+
// Copyright (c) 2023-2024 Cisco and/or its affiliates.
44
//
55
// SPDX-License-Identifier: Apache-2.0
66
//
@@ -29,7 +29,6 @@ import (
2929
"github.com/networkservicemesh/api/pkg/api/networkservice/mechanisms/kernel"
3030
"github.com/networkservicemesh/sdk-kernel/pkg/kernel/networkservice/vfconfig"
3131
"github.com/networkservicemesh/sdk/pkg/tools/log"
32-
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"
3332
"github.com/pkg/errors"
3433

3534
"github.com/networkservicemesh/sdk-ovs/pkg/tools/ifnames"
@@ -59,7 +58,8 @@ func setupVF(ctx context.Context, logger log.Logger, conn *networkservice.Connec
5958
return errors.Wrapf(err, "failed to find VF representor for uplink %s", vfConfig.PFInterfaceName)
6059
}
6160
if _, exists := parentIfRefCount[vfRepresentor]; !exists {
62-
stdout, stderr, err1 := util.RunOVSVsctl("--", "--may-exist", "add-port", bridgeName, vfRepresentor)
61+
w := &ovsutil.OVSRunWrapper{Logger: logger}
62+
stdout, stderr, err1 := w.RunOVSVsctl("--", "--may-exist", "add-port", bridgeName, vfRepresentor)
6363
if err1 != nil {
6464
logger.Errorf("Failed to add representor port %s to %s, stdout: %q, stderr: %q,"+
6565
" error: %v", vfRepresentor, bridgeName, stdout, stderr, err1)
@@ -91,8 +91,9 @@ func resetVF(logger log.Logger, portInfo *ifnames.OvsPortInfo, parentIfRefCountM
9191
}
9292
if refCount == 0 {
9393
if !isL2Connect {
94+
w := &ovsutil.OVSRunWrapper{Logger: logger}
9495
// this op is valid only for p2p connection
95-
stdout, stderr, err := util.RunOVSVsctl("del-port", bridgeName, portInfo.PortName)
96+
stdout, stderr, err := w.RunOVSVsctl("del-port", bridgeName, portInfo.PortName)
9697
if err != nil {
9798
logger.Errorf("Failed to delete port %s from %s, stdout: %q, stderr: %q,"+
9899
" error: %v", portInfo.PortName, bridgeName, stdout, stderr, err)

‎pkg/networkservice/mechanisms/vlan/client.go‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// Copyright (c) 2021-2022 Nordix Foundation.
1+
// Copyright (c) 2021-2024 Nordix Foundation.
22
//
3-
// Copyright (c) 2023 Cisco and/or its affiliates.
3+
// Copyright (c) 2023-2024 Cisco and/or its affiliates.
44
//
55
// SPDX-License-Identifier: Apache-2.0
66
//
@@ -26,8 +26,6 @@ import (
2626
"context"
2727
"fmt"
2828

29-
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"
30-
3129
"github.com/golang/protobuf/ptypes/empty"
3230
"github.com/networkservicemesh/api/pkg/api/networkservice"
3331
"github.com/networkservicemesh/api/pkg/api/networkservice/mechanisms/cls"
@@ -119,15 +117,16 @@ func (c *vlanClient) addDelVlan(ctx context.Context, logger log.Logger, conn *ne
119117
if !ok {
120118
return nil
121119
}
120+
w := &ovsutil.OVSRunWrapper{Logger: logger}
122121
if isAdd {
123122
// delete the ns client port from br-nsm bridge and add it into l2 connect bridge with vlan tag.
124-
stdout, stderr, err := util.RunOVSVsctl("del-port", c.bridgeName, nsClientOvsPortInfo.PortName)
123+
stdout, stderr, err := w.RunOVSVsctl("del-port", c.bridgeName, nsClientOvsPortInfo.PortName)
125124
if err != nil {
126125
logger.Errorf("Failed to delete port %s from %s, stdout: %q, stderr: %q,"+
127126
" error: %v", nsClientOvsPortInfo.PortName, c.bridgeName, stdout, stderr, err)
128127
return errors.Wrapf(err, "Failed to delete port %s from %s, stdout: %q, stderr: %q", nsClientOvsPortInfo.PortName, c.bridgeName, stdout, stderr)
129128
}
130-
stdout, stderr, err = util.RunOVSVsctl("--", "--may-exist", "add-port", l2Point.Bridge,
129+
stdout, stderr, err = w.RunOVSVsctl("--", "--may-exist", "add-port", l2Point.Bridge,
131130
nsClientOvsPortInfo.PortName, fmt.Sprintf("tag=%d", mechanism.GetVlanID()))
132131
if err != nil {
133132
logger.Errorf("Failed to add port %s to %s, stdout: %q, stderr: %q,"+
@@ -137,7 +136,7 @@ func (c *vlanClient) addDelVlan(ctx context.Context, logger log.Logger, conn *ne
137136
nsClientOvsPortInfo.IsL2Connect = true
138137
nsClientOvsPortInfo.IsCrossConnected = true
139138
} else {
140-
stdout, stderr, err := util.RunOVSVsctl("del-port", l2Point.Bridge, nsClientOvsPortInfo.PortName)
139+
stdout, stderr, err := w.RunOVSVsctl("del-port", l2Point.Bridge, nsClientOvsPortInfo.PortName)
141140
if err != nil {
142141
logger.Errorf("Failed to delete port %s from %s, stdout: %q, stderr: %q,"+
143142
" error: %v", nsClientOvsPortInfo.PortName, l2Point.Bridge, stdout, stderr, err)

‎pkg/networkservice/mechanisms/vxlan/client.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2021-2022 Nordix Foundation.
1+
// Copyright (c) 2021-2024 Nordix Foundation.
22
//
33
// SPDX-License-Identifier: Apache-2.0
44
//
@@ -88,7 +88,7 @@ func (c *vxlanClient) Request(ctx context.Context, request *networkservice.Netwo
8888
func (c *vxlanClient) Close(ctx context.Context, conn *networkservice.Connection, opts ...grpc.CallOption) (*empty.Empty, error) {
8989
_, err := next.Client(ctx).Close(ctx, conn, opts...)
9090

91-
vxlanClientErr := remove(conn, c.bridgeName, c.vxlanInterfacesMutex, c.vxlanInterfacesMap, true)
91+
vxlanClientErr := remove(conn, c.bridgeName, c.vxlanInterfacesMutex, c.vxlanInterfacesMap, true, log.FromContext(ctx).WithField("vxlanClient", "Close"))
9292

9393
if err != nil && vxlanClientErr != nil {
9494
return nil, errors.Wrap(err, vxlanClientErr.Error())

‎pkg/networkservice/mechanisms/vxlan/common.go‎

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
// Copyright (c) 2021-2022 Nordix Foundation.
1+
// Copyright (c) 2021-2024 Nordix Foundation.
22
//
3-
// Copyright (c) 2023 Cisco and/or its affiliates.
3+
// Copyright (c) 2023-2024 Cisco and/or its affiliates.
44
//
55
// SPDX-License-Identifier: Apache-2.0
66
//
@@ -30,7 +30,6 @@ import (
3030
"github.com/networkservicemesh/api/pkg/api/networkservice"
3131
"github.com/networkservicemesh/api/pkg/api/networkservice/mechanisms/vxlan"
3232
"github.com/networkservicemesh/sdk/pkg/tools/log"
33-
"github.com/ovn-org/ovn-kubernetes/go-controller/pkg/util"
3433
"github.com/pkg/errors"
3534

3635
"github.com/networkservicemesh/sdk-ovs/pkg/tools/ifnames"
@@ -62,7 +61,7 @@ func add(ctx context.Context, logger log.Logger, conn *networkservice.Connection
6261
vxlanInterfacesMutex.Lock()
6362
defer vxlanInterfacesMutex.Unlock()
6463
if _, exists := vxlanRefCountMap[ovsTunnelName]; !exists {
65-
if err := newVXLAN(bridgeName, ovsTunnelName, egressIP, remoteIP); err != nil {
64+
if err := newVXLAN(bridgeName, ovsTunnelName, egressIP, remoteIP, logger); err != nil {
6665
return err
6766
}
6867
vxlanRefCountMap[ovsTunnelName] = 0
@@ -83,7 +82,7 @@ func getTunnelPortName(remoteIP string) string {
8382
}
8483

8584
func remove(conn *networkservice.Connection, bridgeName string, vxlanInterfacesMutex sync.Locker,
86-
vxlanRefCountMap map[string]int, isClient bool) error {
85+
vxlanRefCountMap map[string]int, isClient bool, logger log.Logger) error {
8786
if mechanism := vxlan.ToMechanism(conn.GetMechanism()); mechanism != nil {
8887
var remoteIP net.IP
8988
if !isClient {
@@ -95,7 +94,7 @@ func remove(conn *networkservice.Connection, bridgeName string, vxlanInterfacesM
9594
vxlanInterfacesMutex.Lock()
9695
defer vxlanInterfacesMutex.Unlock()
9796
if count := vxlanRefCountMap[ovsTunnelName]; count == 1 {
98-
if err := deleteVXLAN(bridgeName, ovsTunnelName); err != nil {
97+
if err := deleteVXLAN(bridgeName, ovsTunnelName, logger); err != nil {
9998
return err
10099
}
101100
delete(vxlanRefCountMap, ovsTunnelName)
@@ -107,23 +106,26 @@ func remove(conn *networkservice.Connection, bridgeName string, vxlanInterfacesM
107106
}
108107

109108
// newVXLAN creates a VXLAN interface instance in OVS
110-
func newVXLAN(bridgeName, ovsTunnelName string, egressIP, remoteIP net.IP) error {
109+
func newVXLAN(bridgeName, ovsTunnelName string, egressIP, remoteIP net.IP, logger log.Logger) error {
111110
/* Populate the VXLAN interface configuration */
112111
localOptions := "options:local_ip=" + egressIP.String()
113112
remoteOptions := "options:remote_ip=" + remoteIP.String()
114-
stdout, stderr, err := util.RunOVSVsctl("--", "--may-exist", "add-port", bridgeName, ovsTunnelName,
113+
114+
w := ovsutil.OVSRunWrapper{Logger: logger}
115+
stdout, stderr, err := w.RunOVSVsctl("--", "--may-exist", "add-port", bridgeName, ovsTunnelName,
115116
"--", "set", "interface", ovsTunnelName, "type=vxlan", localOptions,
116-
remoteOptions, "options:key=flow")
117+
remoteOptions, "options:key=flow", "options:dst_port=4466")
117118
if err != nil {
118119
return errors.Errorf("Failed to add port %s to %s, stdout: %q, stderr: %q,"+
119120
" error: %v", ovsTunnelName, bridgeName, stdout, stderr, err)
120121
}
121122
return nil
122123
}
123124

124-
func deleteVXLAN(bridgeName, ovsTunnelPort string) error {
125+
func deleteVXLAN(bridgeName, ovsTunnelPort string, logger log.Logger) error {
126+
w := ovsutil.OVSRunWrapper{Logger: logger}
125127
/* Populate the VXLAN interface configuration */
126-
stdout, stderr, err := util.RunOVSVsctl("del-port", bridgeName, ovsTunnelPort)
128+
stdout, stderr, err := w.RunOVSVsctl("del-port", bridgeName, ovsTunnelPort)
127129
if err != nil {
128130
return errors.Errorf("Failed to delete port %s to %s, stdout: %q, stderr: %q,"+
129131
" error: %v", ovsTunnelPort, bridgeName, stdout, stderr, err)

‎pkg/networkservice/mechanisms/vxlan/server.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2021-2022 Nordix Foundation.
1+
// Copyright (c) 2021-2024 Nordix Foundation.
22
//
33
// SPDX-License-Identifier: Apache-2.0
44
//
@@ -75,7 +75,7 @@ func (v *vxlanServer) Request(ctx context.Context, request *networkservice.Netwo
7575
closeCtx, cancelClose := postponeCtxFunc()
7676
defer cancelClose()
7777
if _, exists := ifnames.LoadAndDelete(closeCtx, metadata.IsClient(v)); exists {
78-
if vxlanServerErr := remove(request.GetConnection(), v.bridgeName, v.vxlanInterfacesMutex, v.vxlanInterfacesMap, metadata.IsClient(v)); vxlanServerErr != nil {
78+
if vxlanServerErr := remove(request.GetConnection(), v.bridgeName, v.vxlanInterfacesMutex, v.vxlanInterfacesMap, metadata.IsClient(v), logger); vxlanServerErr != nil {
7979
err = errors.Wrapf(err, "connection closed with error: %s", vxlanServerErr.Error())
8080
}
8181
}
@@ -88,7 +88,7 @@ func (v *vxlanServer) Request(ctx context.Context, request *networkservice.Netwo
8888
func (v *vxlanServer) Close(ctx context.Context, conn *networkservice.Connection) (*empty.Empty, error) {
8989
_, err := next.Server(ctx).Close(ctx, conn)
9090
if mechanism := vxlan.ToMechanism(conn.GetMechanism()); mechanism != nil {
91-
vxlanServerErr := remove(conn, v.bridgeName, v.vxlanInterfacesMutex, v.vxlanInterfacesMap, metadata.IsClient(v))
91+
vxlanServerErr := remove(conn, v.bridgeName, v.vxlanInterfacesMutex, v.vxlanInterfacesMap, metadata.IsClient(v), log.FromContext(ctx).WithField("vxlanServer", "Close"))
9292
ifnames.Delete(ctx, metadata.IsClient(v))
9393

9494
if err != nil && vxlanServerErr != nil {

0 commit comments

Comments
 (0)