f-81: l3vni: route unreachable default dans chaque VRF de VPC #81

Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
GnomeZworc 2026-10-25 11:53:39 +01:00
commit cc8ddfe882
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632
5 changed files with 115 additions and 1 deletions

View file

@ -23,6 +23,8 @@ type host interface {
DeleteLink(name string) error
TableRouteVia(table uint32, dst *net.IPNet, gw net.IP, iface string) error
TableRouteDel(table uint32, dst *net.IPNet) error
TableUnreachableDefault(table uint32) error
TableUnreachableDefaultDel(table uint32) error
ApplyVRF(v frr.VRF) error
WithdrawVRF(v frr.VRF) error
RemoveVRF(v frr.VRF) error
@ -87,6 +89,14 @@ func (system) TableRouteDel(table uint32, dst *net.IPNet) error {
return netif.RouteDelIfExists(int(table), dst)
}
func (system) TableUnreachableDefault(table uint32) error {
return netif.RouteReplaceUnreachableDefault(int(table), UnreachableMetric)
}
func (system) TableUnreachableDefaultDel(table uint32) error {
return netif.RouteDelUnreachableDefaultIfExists(int(table), UnreachableMetric)
}
func (s system) ApplyVRF(v frr.VRF) error { return s.frr.ApplyVRF(v) }
func (s system) WithdrawVRF(v frr.VRF) error { return s.frr.WithdrawVRF(v) }

View file

@ -14,6 +14,8 @@ import (
"github.com/dgraph-io/badger/v4"
)
const UnreachableMetric = 4278198272
var (
transitHost = &net.IPNet{IP: net.IPv4(169, 254, 0, 1).To4(), Mask: net.CIDRMask(30, 32)}
transitNetns = &net.IPNet{IP: net.IPv4(169, 254, 0, 2).To4(), Mask: net.CIDRMask(30, 32)}
@ -84,6 +86,7 @@ func createL3(h host, cfg *configuration.Config, v l3VPC) error {
run func() error
}{
{"create " + v.vrf(), func() error { return h.CreateVRF(v.vrf(), v.vni) }},
{"unreachable default in " + v.vrf(), func() error { return h.TableUnreachableDefault(v.vni) }},
{"create " + v.bridge(), func() error { return h.CreateBridge(v.bridge(), mtu, rmac) }},
{"attach " + v.bridge(), func() error { return h.SetMaster(v.bridge(), v.vrf()) }},
{"create " + v.vxlan(), func() error { return h.CreateVxlan(v.vxlan(), int(v.vni), cfg.DefaultInterface, mtu) }},
@ -123,6 +126,9 @@ func deleteL3(h host, v l3VPC) error {
return fmt.Errorf("l3vni %d: delete %s: %w", v.vni, link, err)
}
}
if err := h.TableUnreachableDefaultDel(v.vni); err != nil {
return fmt.Errorf("l3vni %d: delete unreachable default from table %d: %w", v.vni, v.vni, err)
}
if err := h.RemoveVRF(frrVRF); err != nil {
return fmt.Errorf("l3vni %d: remove frr vrf: %w", v.vni, err)
}

View file

@ -83,6 +83,14 @@ func (f *fakeHost) TableRouteDel(table uint32, dst *net.IPNet) error {
return f.record(fmt.Sprintf("table %d del %s", table, dst))
}
func (f *fakeHost) TableUnreachableDefault(table uint32) error {
return f.record(fmt.Sprintf("table %d unreachable default", table))
}
func (f *fakeHost) TableUnreachableDefaultDel(table uint32) error {
return f.record(fmt.Sprintf("table %d del unreachable default", table))
}
func (f *fakeHost) ApplyVRF(v frr.VRF) error {
return f.record(fmt.Sprintf("frr apply asn=%d id=%s vni=%d vtep=%s supernet=%s", v.ASN, v.ID, v.L3VNI, v.VTEP, v.Supernet))
}
@ -121,6 +129,7 @@ func TestCreateL3FollowsTheLabRecipe(t *testing.T) {
want := []string{
"vtep br-000000",
"vrf vrf-s7 table 2700",
"table 2700 unreachable default",
"bridge brl3-s7 mtu 1450 mac 02:02:c0:a8:0e:0b",
"master brl3-s7 vrf-s7",
"vxlan vxl3-s7 id 2700 dev br-000000 mtu 1450",
@ -179,6 +188,7 @@ func TestDeleteL3WithdrawsFRRThenTheKernelThenTheVRF(t *testing.T) {
"del vxl3-s7",
"del brl3-s7",
"del vrf-s7",
"table 2700 del unreachable default",
"frr remove asn=0 id=s7 vni=0",
}
if !reflect.DeepEqual(f.calls, want) {
@ -209,9 +219,39 @@ func TestDeleteL3KeepsTheFRRVRFWhenAKernelLinkCannotBeDeleted(t *testing.T) {
}
}
func TestCreateL3LeavesNoVRFWithoutItsUnreachableDefault(t *testing.T) {
f := &fakeHost{fail: map[string]error{"table 2700 unreachable default": errors.New("operation not permitted")}}
err := createL3(f, bgpConfig(), labL3(t))
if err == nil || !strings.Contains(err.Error(), "l3vni 2700: unreachable default in vrf-s7: operation not permitted") {
t.Errorf("erreur %v", err)
}
if last := f.calls[len(f.calls)-1]; last != "table 2700 unreachable default" {
t.Errorf("appels après l'échec : %q", f.calls)
}
}
func TestDeleteL3KeepsTheFRRVRFWhenTheUnreachableDefaultCannotBeDeleted(t *testing.T) {
f := &fakeHost{fail: map[string]error{"table 2700 del unreachable default": errors.New("operation not permitted")}}
err := deleteL3(f, labL3(t))
if err == nil || !strings.Contains(err.Error(), "delete unreachable default from table 2700") {
t.Errorf("erreur %v", err)
}
for _, c := range f.calls {
if strings.HasPrefix(c, "frr remove") {
t.Errorf("étape exécutée après l'échec : %q", f.calls)
}
}
}
func TestUnreachableMetricIsTheHighestRecommendedByTheKernel(t *testing.T) {
if UnreachableMetric != 4278198272 {
t.Errorf("UnreachableMetric = %d", UnreachableMetric)
}
}
func TestDeleteL3DoesNotDependOnTheAgentBGPSection(t *testing.T) {
f := &fakeHost{}
if err := deleteL3(f, labL3(t)); err != nil || len(f.calls) != 6 {
if err := deleteL3(f, labL3(t)); err != nil || len(f.calls) != 7 {
t.Errorf("erreur %v, appels %q", err, f.calls)
}
}

View file

@ -3,11 +3,16 @@
package netif
import (
"errors"
"net"
"syscall"
"github.com/vishvananda/netlink"
"golang.org/x/sys/unix"
)
var defaultIPv4 = &net.IPNet{IP: net.IPv4zero.To4(), Mask: net.CIDRMask(0, 32)}
func RouteAdd(iface string, subnet *net.IPNet) error {
return RouteAddFrom(iface, subnet, nil)
}
@ -45,3 +50,44 @@ func TableRoutesVia(table int, iface string) ([]*net.IPNet, error) {
}
return dsts, nil
}
func unreachableDefault(table, metric int) *netlink.Route {
return &netlink.Route{
Dst: defaultIPv4,
Table: table,
Type: unix.RTN_UNREACHABLE,
Priority: metric,
}
}
func RouteReplaceUnreachableDefault(table, metric int) error {
return netlink.RouteReplace(unreachableDefault(table, metric))
}
func RouteDelUnreachableDefaultIfExists(table, metric int) error {
if err := netlink.RouteDel(unreachableDefault(table, metric)); err != nil && !errors.Is(err, syscall.ESRCH) {
return err
}
return nil
}
func HasUnreachableDefault(table, metric int) (bool, error) {
routes, err := netlink.RouteListFiltered(netlink.FAMILY_V4, &netlink.Route{
Table: table,
Type: unix.RTN_UNREACHABLE,
}, netlink.RT_FILTER_TABLE|netlink.RT_FILTER_TYPE)
if err != nil {
return false, err
}
for _, r := range routes {
if r.Priority == metric && (r.Dst == nil || isDefault(r.Dst)) {
return true, nil
}
}
return false, nil
}
func isDefault(dst *net.IPNet) bool {
ones, _ := dst.Mask.Size()
return ones == 0
}

View file

@ -18,3 +18,15 @@ func RouteAddFrom(_ string, _ *net.IPNet, _ net.IP) error {
func TableRoutesVia(_ int, _ string) ([]*net.IPNet, error) {
return nil, errors.New("route listing is only implemented on linux")
}
func RouteReplaceUnreachableDefault(_, _ int) error {
return errors.New("not supported on this platform")
}
func RouteDelUnreachableDefaultIfExists(_, _ int) error {
return errors.New("not supported on this platform")
}
func HasUnreachableDefault(_, _ int) (bool, error) {
return false, errors.New("route listing is only implemented on linux")
}