Skip to content

set uplink admin-up only after it has been configured #918

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

Draft
aritrbas wants to merge 1 commit into
base: master
Choose a base branch
from
Draft

set uplink admin-up only after it has been configured #918

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
17 changes: 8 additions & 9 deletions vpp-manager/vpp_runner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -487,6 +487,13 @@ func (v *VppRunner) configureVppUplinkInterface(
return errors.Wrap(err, "Error disabling ipv6 RA on uplink interface")
}

// Keep the interface admin-down until RA suppression is installed, then
// bring it up before programming the rest of IPv6/L3 state.
err = v.vpp.Retry(2*time.Second, 10, v.vpp.InterfaceAdminUp, ifSpec.SwIfIndex)
if err != nil {
return errors.Wrap(err, "Error setting uplink interface up")
}

err = v.vpp.CnatEnableFeatures(ifSpec.SwIfIndex)
if err != nil {
return errors.Wrap(err, "Error configuring NAT on uplink interface")
Expand Down Expand Up @@ -1008,15 +1015,7 @@ func (v *VppRunner) runVpp() (err error) {
return errors.Wrap(err, "Error creating uplink interface")
}

// Data interface configuration
err = v.vpp.Retry(2*time.Second, 10, v.vpp.InterfaceAdminUp, v.params.UplinksSpecs[idx].SwIfIndex)
if err != nil {
terminateVpp("Error setting uplink interface up: %v", err)
v.vpp.Close()
<-vppDeadChan
return errors.Wrap(err, "Error setting uplink interface up")
}

// Configure uplink and only bring it up after RA suppression is set.
err = v.configureVppUplinkInterface(v.uplinkDriver[idx], v.conf[idx], v.params.UplinksSpecs[idx])

if err != nil {
Expand Down
Loading