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

fix(bridge): avoid LinkByName netlink calls #148

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(bridge): avoid LinkByName netlink calls #148

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
7 changes: 1 addition & 6 deletions pkg/evpn/bridge.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,6 @@ func (s *Server) CreateLogicalBridge(_ context.Context, in *pb.CreateLogicalBrid
}
// create vxlan only if VNI is not empty
if in.LogicalBridge.Spec.Vni != nil {
bridge, err := s.nLink.LinkByName(tenantbridgeName)
if err != nil {
err := status.Errorf(codes.NotFound, "unable to find key %s", tenantbridgeName)
log.Printf("error: %v", err)
return nil, err
}
// Example: ip link add vxlan-<LB-vlan-id> type vxlan id <LB-vni> local <vtep-ip> dstport 4789 nolearning proxy
myip := make(net.IP, 4)
binary.BigEndian.PutUint32(myip, in.LogicalBridge.Spec.VtepIpPrefix.Addr.GetV4Addr())
Expand All @@ -85,6 +79,7 @@ func (s *Server) CreateLogicalBridge(_ context.Context, in *pb.CreateLogicalBrid
return nil, err
}
// Example: ip link set vxlan-<LB-vlan-id> master br-tenant addrgenmode none
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: tenantbridgeName}}
if err := s.nLink.LinkSetMaster(vxlan, bridge); err != nil {
fmt.Printf("Failed to add Vxlan to bridge: %v", err)
return nil, err
Expand Down
17 changes: 0 additions & 17 deletions pkg/evpn/bridge_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,17 +139,6 @@ func Test_CreateLogicalBridge(t *testing.T) {
errMsg: "",
exist: true,
},
"failed LinkByName call": {
id: testLogicalBridgeID,
in: &testLogicalBridge,
out: nil,
errCode: codes.NotFound,
errMsg: fmt.Sprintf("unable to find key %v", tenantbridgeName),
exist: false,
on: func(mockNetlink *mocks.Netlink, errMsg string) {
mockNetlink.EXPECT().LinkByName(tenantbridgeName).Return(nil, errors.New(errMsg)).Once()
},
},
"failed LinkAdd call": {
id: testLogicalBridgeID,
in: &testLogicalBridge,
Expand All @@ -163,8 +152,6 @@ func Test_CreateLogicalBridge(t *testing.T) {
binary.BigEndian.PutUint32(myip, 167772162)
vxlanName := fmt.Sprintf("vni%d", *testLogicalBridge.Spec.Vni)
vxlan := &netlink.Vxlan{LinkAttrs: netlink.LinkAttrs{Name: vxlanName}, VxlanId: int(*testLogicalBridge.Spec.Vni), Port: 4789, Learning: false, SrcAddr: myip}
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: tenantbridgeName}}
mockNetlink.EXPECT().LinkByName(tenantbridgeName).Return(bridge, nil).Once()
mockNetlink.EXPECT().LinkAdd(vxlan).Return(errors.New(errMsg)).Once()
},
},
Expand All @@ -181,7 +168,6 @@ func Test_CreateLogicalBridge(t *testing.T) {
vxlanName := fmt.Sprintf("vni%d", *testLogicalBridge.Spec.Vni)
vxlan := &netlink.Vxlan{LinkAttrs: netlink.LinkAttrs{Name: vxlanName}, VxlanId: int(*testLogicalBridge.Spec.Vni), Port: 4789, Learning: false, SrcAddr: myip}
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: tenantbridgeName}}
mockNetlink.EXPECT().LinkByName(tenantbridgeName).Return(bridge, nil).Once()
mockNetlink.EXPECT().LinkAdd(vxlan).Return(nil).Once()
mockNetlink.EXPECT().LinkSetMaster(vxlan, bridge).Return(errors.New(errMsg)).Once()
},
Expand All @@ -199,7 +185,6 @@ func Test_CreateLogicalBridge(t *testing.T) {
vxlanName := fmt.Sprintf("vni%d", *testLogicalBridge.Spec.Vni)
vxlan := &netlink.Vxlan{LinkAttrs: netlink.LinkAttrs{Name: vxlanName}, VxlanId: int(*testLogicalBridge.Spec.Vni), Port: 4789, Learning: false, SrcAddr: myip}
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: tenantbridgeName}}
mockNetlink.EXPECT().LinkByName(tenantbridgeName).Return(bridge, nil).Once()
mockNetlink.EXPECT().LinkAdd(vxlan).Return(nil).Once()
mockNetlink.EXPECT().LinkSetMaster(vxlan, bridge).Return(nil).Once()
mockNetlink.EXPECT().LinkSetUp(vxlan).Return(errors.New(errMsg)).Once()
Expand All @@ -218,7 +203,6 @@ func Test_CreateLogicalBridge(t *testing.T) {
vxlanName := fmt.Sprintf("vni%d", *testLogicalBridge.Spec.Vni)
vxlan := &netlink.Vxlan{LinkAttrs: netlink.LinkAttrs{Name: vxlanName}, VxlanId: int(*testLogicalBridge.Spec.Vni), Port: 4789, Learning: false, SrcAddr: myip}
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: tenantbridgeName}}
mockNetlink.EXPECT().LinkByName(tenantbridgeName).Return(bridge, nil).Once()
mockNetlink.EXPECT().LinkAdd(vxlan).Return(nil).Once()
mockNetlink.EXPECT().LinkSetMaster(vxlan, bridge).Return(nil).Once()
mockNetlink.EXPECT().LinkSetUp(vxlan).Return(nil).Once()
Expand All @@ -239,7 +223,6 @@ func Test_CreateLogicalBridge(t *testing.T) {
vxlanName := fmt.Sprintf("vni%d", *testLogicalBridge.Spec.Vni)
vxlan := &netlink.Vxlan{LinkAttrs: netlink.LinkAttrs{Name: vxlanName}, VxlanId: int(*testLogicalBridge.Spec.Vni), Port: 4789, Learning: false, SrcAddr: myip}
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: tenantbridgeName}}
mockNetlink.EXPECT().LinkByName(tenantbridgeName).Return(bridge, nil).Once()
mockNetlink.EXPECT().LinkAdd(vxlan).Return(nil).Once()
mockNetlink.EXPECT().LinkSetMaster(vxlan, bridge).Return(nil).Once()
mockNetlink.EXPECT().LinkSetUp(vxlan).Return(nil).Once()
Expand Down
7 changes: 1 addition & 6 deletions pkg/evpn/svi.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,12 +85,7 @@ func (s *Server) CreateSvi(_ context.Context, in *pb.CreateSviRequest) (*pb.Svi,
return nil, err
}
// not found, so create a new one
bridge, err := s.nLink.LinkByName(tenantbridgeName)
if err != nil {
err := status.Errorf(codes.NotFound, "unable to find key %s", tenantbridgeName)
log.Printf("error: %v", err)
return nil, err
}
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: tenantbridgeName}}
vid := uint16(bridgeObject.Spec.VlanId)
// Example: bridge vlan add dev br-tenant vid <vlan-id> self
if err := s.nLink.BridgeVlanAdd(bridge, vid, false, false, true, false); err != nil {
Expand Down
19 changes: 0 additions & 19 deletions pkg/evpn/svi_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,17 +204,6 @@ func Test_CreateSvi(t *testing.T) {
exist: false,
on: nil,
},
"failed bridge LinkByName call": {
id: testSviID,
in: &testSvi,
out: nil,
errCode: codes.NotFound,
errMsg: fmt.Sprintf("unable to find key %v", tenantbridgeName),
exist: false,
on: func(mockNetlink *mocks.Netlink, errMsg string) {
mockNetlink.EXPECT().LinkByName(tenantbridgeName).Return(nil, errors.New(errMsg)).Once()
},
},
"failed BridgeVlanAdd call": {
id: testSviID,
in: &testSvi,
Expand All @@ -225,7 +214,6 @@ func Test_CreateSvi(t *testing.T) {
on: func(mockNetlink *mocks.Netlink, errMsg string) {
vid := uint16(testLogicalBridge.Spec.VlanId)
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: tenantbridgeName}}
mockNetlink.EXPECT().LinkByName(tenantbridgeName).Return(bridge, nil).Once()
mockNetlink.EXPECT().BridgeVlanAdd(bridge, vid, false, false, true, false).Return(errors.New(errMsg)).Once()
},
},
Expand All @@ -239,7 +227,6 @@ func Test_CreateSvi(t *testing.T) {
on: func(mockNetlink *mocks.Netlink, errMsg string) {
vid := uint16(testLogicalBridge.Spec.VlanId)
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: tenantbridgeName}}
mockNetlink.EXPECT().LinkByName(tenantbridgeName).Return(bridge, nil).Once()
mockNetlink.EXPECT().BridgeVlanAdd(bridge, vid, false, false, true, false).Return(nil).Once()
vlanName := fmt.Sprintf("vlan%d", vid)
vlandev := &netlink.Vlan{LinkAttrs: netlink.LinkAttrs{Name: vlanName, ParentIndex: bridge.Attrs().Index}, VlanId: int(vid)}
Expand All @@ -256,7 +243,6 @@ func Test_CreateSvi(t *testing.T) {
on: func(mockNetlink *mocks.Netlink, errMsg string) {
vid := uint16(testLogicalBridge.Spec.VlanId)
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: tenantbridgeName}}
mockNetlink.EXPECT().LinkByName(tenantbridgeName).Return(bridge, nil).Once()
mockNetlink.EXPECT().BridgeVlanAdd(bridge, vid, false, false, true, false).Return(nil).Once()
vlanName := fmt.Sprintf("vlan%d", vid)
vlandev := &netlink.Vlan{LinkAttrs: netlink.LinkAttrs{Name: vlanName, ParentIndex: bridge.Attrs().Index}, VlanId: int(vid)}
Expand All @@ -275,7 +261,6 @@ func Test_CreateSvi(t *testing.T) {
on: func(mockNetlink *mocks.Netlink, errMsg string) {
vid := uint16(testLogicalBridge.Spec.VlanId)
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: tenantbridgeName}}
mockNetlink.EXPECT().LinkByName(tenantbridgeName).Return(bridge, nil).Once()
mockNetlink.EXPECT().BridgeVlanAdd(bridge, vid, false, false, true, false).Return(nil).Once()
vlanName := fmt.Sprintf("vlan%d", vid)
vlandev := &netlink.Vlan{LinkAttrs: netlink.LinkAttrs{Name: vlanName, ParentIndex: bridge.Attrs().Index}, VlanId: int(vid)}
Expand All @@ -297,7 +282,6 @@ func Test_CreateSvi(t *testing.T) {
on: func(mockNetlink *mocks.Netlink, errMsg string) {
vid := uint16(testLogicalBridge.Spec.VlanId)
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: tenantbridgeName}}
mockNetlink.EXPECT().LinkByName(tenantbridgeName).Return(bridge, nil).Once()
mockNetlink.EXPECT().BridgeVlanAdd(bridge, vid, false, false, true, false).Return(nil).Once()
vlanName := fmt.Sprintf("vlan%d", vid)
vlandev := &netlink.Vlan{LinkAttrs: netlink.LinkAttrs{Name: vlanName, ParentIndex: bridge.Attrs().Index}, VlanId: int(vid)}
Expand All @@ -320,7 +304,6 @@ func Test_CreateSvi(t *testing.T) {
on: func(mockNetlink *mocks.Netlink, errMsg string) {
vid := uint16(testLogicalBridge.Spec.VlanId)
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: tenantbridgeName}}
mockNetlink.EXPECT().LinkByName(tenantbridgeName).Return(bridge, nil).Once()
mockNetlink.EXPECT().BridgeVlanAdd(bridge, vid, false, false, true, false).Return(nil).Once()
vlanName := fmt.Sprintf("vlan%d", vid)
vlandev := &netlink.Vlan{LinkAttrs: netlink.LinkAttrs{Name: vlanName, ParentIndex: bridge.Attrs().Index}, VlanId: int(vid)}
Expand All @@ -345,7 +328,6 @@ func Test_CreateSvi(t *testing.T) {
on: func(mockNetlink *mocks.Netlink, errMsg string) {
vid := uint16(testLogicalBridge.Spec.VlanId)
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: tenantbridgeName}}
mockNetlink.EXPECT().LinkByName(tenantbridgeName).Return(bridge, nil).Once()
mockNetlink.EXPECT().BridgeVlanAdd(bridge, vid, false, false, true, false).Return(nil).Once()
vlanName := fmt.Sprintf("vlan%d", vid)
vlandev := &netlink.Vlan{LinkAttrs: netlink.LinkAttrs{Name: vlanName, ParentIndex: bridge.Attrs().Index}, VlanId: int(vid)}
Expand All @@ -371,7 +353,6 @@ func Test_CreateSvi(t *testing.T) {
on: func(mockNetlink *mocks.Netlink, errMsg string) {
vid := uint16(testLogicalBridge.Spec.VlanId)
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: tenantbridgeName}}
mockNetlink.EXPECT().LinkByName(tenantbridgeName).Return(bridge, nil).Once()
mockNetlink.EXPECT().BridgeVlanAdd(bridge, vid, false, false, true, false).Return(nil).Once()
vlanName := fmt.Sprintf("vlan%d", vid)
vlandev := &netlink.Vlan{LinkAttrs: netlink.LinkAttrs{Name: vlanName, ParentIndex: bridge.Attrs().Index}, VlanId: int(vid)}
Expand Down
7 changes: 1 addition & 6 deletions pkg/evpn/vrf.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,13 +200,8 @@ func (s *Server) DeleteVrf(_ context.Context, in *pb.DeleteVrfRequest) (*emptypb
}
// use netlink to find BRIDGE device
bridgeName := fmt.Sprintf("br%d", *obj.Spec.Vni)
bridgedev, err := s.nLink.LinkByName(bridgeName)
bridgedev := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: bridgeName}}
log.Printf("Deleting BRIDGE %v", bridgedev)
if err != nil {
err := status.Errorf(codes.NotFound, "unable to find key %s", bridgeName)
log.Printf("error: %v", err)
return nil, err
}
// bring link down
if err := s.nLink.LinkSetDown(bridgedev); err != nil {
fmt.Printf("Failed to up link: %v", err)
Expand Down
24 changes: 0 additions & 24 deletions pkg/evpn/vrf_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -450,24 +450,6 @@ func Test_DeleteVrf(t *testing.T) {
mockNetlink.EXPECT().LinkDel(vxlan).Return(errors.New(errMsg)).Once()
},
},
"failed bridge LinkByName call": {
in: testVrfID,
out: &emptypb.Empty{},
errCode: codes.NotFound,
errMsg: fmt.Sprintf("unable to find key %v", "br1000"),
missing: false,
on: func(mockNetlink *mocks.Netlink, errMsg string) {
myip := make(net.IP, 4)
binary.BigEndian.PutUint32(myip, 167772162)
vxlanName := fmt.Sprintf("vni%d", *testVrf.Spec.Vni)
vxlan := &netlink.Vxlan{LinkAttrs: netlink.LinkAttrs{Name: vxlanName}, VxlanId: int(*testVrf.Spec.Vni), Port: 4789, Learning: false, SrcAddr: myip}
mockNetlink.EXPECT().LinkByName(vxlanName).Return(vxlan, nil).Once()
mockNetlink.EXPECT().LinkSetDown(vxlan).Return(nil).Once()
mockNetlink.EXPECT().LinkDel(vxlan).Return(nil).Once()
bridgeName := fmt.Sprintf("br%d", *testVrf.Spec.Vni)
mockNetlink.EXPECT().LinkByName(bridgeName).Return(nil, errors.New(errMsg)).Once()
},
},
"failed bridge LinkSetDown call": {
in: testVrfID,
out: &emptypb.Empty{},
Expand All @@ -484,7 +466,6 @@ func Test_DeleteVrf(t *testing.T) {
mockNetlink.EXPECT().LinkDel(vxlan).Return(nil).Once()
bridgeName := fmt.Sprintf("br%d", *testVrf.Spec.Vni)
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: bridgeName}}
mockNetlink.EXPECT().LinkByName(bridgeName).Return(bridge, nil).Once()
mockNetlink.EXPECT().LinkSetDown(bridge).Return(errors.New(errMsg)).Once()
},
},
Expand All @@ -504,7 +485,6 @@ func Test_DeleteVrf(t *testing.T) {
mockNetlink.EXPECT().LinkDel(vxlan).Return(nil).Once()
bridgeName := fmt.Sprintf("br%d", *testVrf.Spec.Vni)
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: bridgeName}}
mockNetlink.EXPECT().LinkByName(bridgeName).Return(bridge, nil).Once()
mockNetlink.EXPECT().LinkSetDown(bridge).Return(nil).Once()
mockNetlink.EXPECT().LinkDel(bridge).Return(errors.New(errMsg)).Once()
},
Expand All @@ -525,7 +505,6 @@ func Test_DeleteVrf(t *testing.T) {
mockNetlink.EXPECT().LinkDel(vxlan).Return(nil).Once()
bridgeName := fmt.Sprintf("br%d", *testVrf.Spec.Vni)
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: bridgeName}}
mockNetlink.EXPECT().LinkByName(bridgeName).Return(bridge, nil).Once()
mockNetlink.EXPECT().LinkSetDown(bridge).Return(nil).Once()
mockNetlink.EXPECT().LinkDel(bridge).Return(nil).Once()
mockNetlink.EXPECT().LinkByName(testVrfID).Return(nil, errors.New(errMsg)).Once()
Expand All @@ -547,7 +526,6 @@ func Test_DeleteVrf(t *testing.T) {
mockNetlink.EXPECT().LinkDel(vxlan).Return(nil).Once()
bridgeName := fmt.Sprintf("br%d", *testVrf.Spec.Vni)
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: bridgeName}}
mockNetlink.EXPECT().LinkByName(bridgeName).Return(bridge, nil).Once()
mockNetlink.EXPECT().LinkSetDown(bridge).Return(nil).Once()
mockNetlink.EXPECT().LinkDel(bridge).Return(nil).Once()
vrf := &netlink.Vrf{LinkAttrs: netlink.LinkAttrs{Name: testVrfID}, Table: 1001}
Expand All @@ -571,7 +549,6 @@ func Test_DeleteVrf(t *testing.T) {
mockNetlink.EXPECT().LinkDel(vxlan).Return(nil).Once()
bridgeName := fmt.Sprintf("br%d", *testVrf.Spec.Vni)
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: bridgeName}}
mockNetlink.EXPECT().LinkByName(bridgeName).Return(bridge, nil).Once()
mockNetlink.EXPECT().LinkSetDown(bridge).Return(nil).Once()
mockNetlink.EXPECT().LinkDel(bridge).Return(nil).Once()
vrf := &netlink.Vrf{LinkAttrs: netlink.LinkAttrs{Name: testVrfID}, Table: 1001}
Expand All @@ -596,7 +573,6 @@ func Test_DeleteVrf(t *testing.T) {
mockNetlink.EXPECT().LinkDel(vxlan).Return(nil).Once()
bridgeName := fmt.Sprintf("br%d", *testVrf.Spec.Vni)
bridge := &netlink.Bridge{LinkAttrs: netlink.LinkAttrs{Name: bridgeName}}
mockNetlink.EXPECT().LinkByName(bridgeName).Return(bridge, nil).Once()
mockNetlink.EXPECT().LinkSetDown(bridge).Return(nil).Once()
mockNetlink.EXPECT().LinkDel(bridge).Return(nil).Once()
vrf := &netlink.Vrf{LinkAttrs: netlink.LinkAttrs{Name: testVrfID}, Table: 1001}
Expand Down
Loading