Skip to content

fix: enable ip forward on transparent vlan network create #2335

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

Merged
merged 9 commits into from
Nov 2, 2023
Merged

fix: enable ip forward on transparent vlan network create #2335

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4eabb4a
Enable ipv4 forwarding on network creation
QxBytes Oct 23, 2023
07b1e98
Add multitenancy transparent vlan conflist to dropgz
QxBytes Oct 23, 2023
8989ded
Test if applying fix each time works
QxBytes Oct 23, 2023
cb7fc23
Address linter issues
QxBytes Oct 27, 2023
b197068
Revert "Test if applying fix each time works"
QxBytes Oct 30, 2023
65d703e
Remove overlap in adding dropgz conflist
QxBytes Oct 31, 2023
c147e1b
Add unit test if forwarding fails
QxBytes Nov 1, 2023
721848b
Make error handling consistent with ipv6 forwarding
QxBytes Nov 2, 2023
8e6b094
Address linter issue
QxBytes Nov 2, 2023
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
5 changes: 5 additions & 0 deletions network/network_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,11 @@ func (nm *networkManager) newNetworkImpl(nwInfo *NetworkInfo, extIf *externalInt
case opModeTransparentVlan:
logger.Info("Transparent vlan mode")
ifName = extIf.Name
nu := networkutils.NewNetworkUtils(nm.netlink, nm.plClient)
Copy link
Member

@tamilmani1989 tamilmani1989 Nov 1, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we add UT for this code? if it returns error, cni should bubble up the err correctly

if err := nu.EnableIPV4Forwarding(); err != nil {
return nil, fmt.Errorf("Ipv4 forwarding failed: %w", err)
}
logger.Info("Ipv4 forwarding enabled")
default:
return nil, errNetworkModeInvalid
}
Expand Down
20 changes: 20 additions & 0 deletions network/network_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,26 @@ var _ = Describe("Test Network", func() {
Expect(nw.Id).To(Equal(nwInfo.Id))
})
})

Context("When we cannot enable ipv4 forwarding", func() {
It("Should error when ipv4 forwarding failed", func() {
nm := &networkManager{
ExternalInterfaces: map[string]*externalInterface{},
plClient: platform.NewMockExecClient(true),
}
nm.ExternalInterfaces["eth0"] = &externalInterface{
Networks: map[string]*network{},
}
nwInfo := &NetworkInfo{
Id: "nw",
MasterIfName: "eth0",
Mode: opModeTransparentVlan,
}
nw, err := nm.newNetwork(nwInfo)
Expect(err).To(MatchError(platform.ErrMockExec))
Expect(nw).To(BeNil())
})
})
})

Describe("Test deleteNetwork", func() {
Expand Down
11 changes: 11 additions & 0 deletions network/networkutils/networkutils_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ const (
enableIPForwardCmd = "sysctl -w net.ipv4.ip_forward=1"
toggleIPV6Cmd = "sysctl -w net.ipv6.conf.all.disable_ipv6=%d"
enableIPV6ForwardCmd = "sysctl -w net.ipv6.conf.all.forwarding=1"
enableIPV4ForwardCmd = "sysctl -w net.ipv4.conf.all.forwarding=1"
disableRACmd = "sysctl -w net.ipv6.conf.%s.accept_ra=0"
acceptRAV6File = "/proc/sys/net/ipv6/conf/%s/accept_ra"
)
Expand Down Expand Up @@ -220,6 +221,16 @@ func (nu NetworkUtils) EnableIPForwarding(ifName string) error {
return nil
}

func (nu NetworkUtils) EnableIPV4Forwarding() error {
_, err := nu.plClient.ExecuteCommand(enableIPV4ForwardCmd)
if err != nil {
logger.Error("Enable ipv4 forwarding failed with", zap.Error(err))
return errors.Wrap(err, "enable ipv4 forwarding failed")
}

return nil
}

func (nu NetworkUtils) EnableIPV6Forwarding() error {
cmd := fmt.Sprint(enableIPV6ForwardCmd)
_, err := nu.plClient.ExecuteCommand(cmd)
Expand Down