f-41: netif: MAC des bridges posée à la création (course avec udev) #41
All checks were successful
Documentation / publish (push) Successful in 1m25s
Release Pipeline / set-release-target (push) Successful in 2s
Release Pipeline / upload-assets (agent.service, systemd/agent.service) (push) Successful in 7s
Release Pipeline / upload-assets (run-dhcp-in-netns.sh, scripts/run-dhcp-in-netns.sh) (push) Successful in 7s
Release Pipeline / upload-assets (dhcp@.service, systemd/dhcp@.service) (push) Successful in 7s
Release Pipeline / upload-assets (dnsmasq@.service, systemd/dnsmasq@.service) (push) Successful in 7s
Release Pipeline / upload-assets (metadata@.service, systemd/metadata@.service) (push) Successful in 7s
Release Pipeline / upload-assets (run-dnsmasq-in-netns.sh, scripts/run-dnsmasq-in-netns.sh) (push) Successful in 7s
Release Pipeline / build (agent, amd64, linux) (push) Successful in 0s
Release Pipeline / build (dhcp, amd64, linux) (push) Successful in 0s
Release Pipeline / build (metadata, amd64, linux) (push) Successful in 0s
Release Pipeline / checksums (push) Successful in 8s
Release Pipeline / release (push) Successful in 30s
Release Pipeline / publish (push) Successful in 0s
Release Pipeline / build (push) Successful in 2m34s

Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
GnomeZworc 2026-10-12 13:59:37 +02:00
commit 989b0d6f4a
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632
7 changed files with 16 additions and 37 deletions

View file

@ -13,8 +13,7 @@ type host interface {
VTEPAddress(iface string) (net.IP, error)
Sysctl(ns, key, value string) error
CreateVRF(name string, table uint32) error
CreateBridge(name string, mtu int) error
SetHardwareAddr(name string, mac net.HardwareAddr) error
CreateBridge(name string, mtu int, mac net.HardwareAddr) error
SetMaster(iface, master string) error
CreateVxlan(name string, vni int, iface string, mtu int) error
CreateVeth(hostIf, nsIf, ns string, mtu int) error
@ -52,10 +51,8 @@ func (system) Sysctl(ns, key, value string) error {
func (system) CreateVRF(name string, table uint32) error { return netif.CreateVRF(name, table) }
func (system) CreateBridge(name string, mtu int) error { return netif.CreateBridge(name, mtu) }
func (system) SetHardwareAddr(name string, mac net.HardwareAddr) error {
return netif.LinkSetHardwareAddr(name, mac)
func (system) CreateBridge(name string, mtu int, mac net.HardwareAddr) error {
return netif.CreateBridge(name, mtu, mac)
}
func (system) SetMaster(iface, master string) error { return netif.BridgeSetMaster(iface, master) }

View file

@ -85,8 +85,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) }},
{"create " + v.bridge(), func() error { return h.CreateBridge(v.bridge(), l3MTU) }},
{"set router mac on " + v.bridge(), func() error { return h.SetHardwareAddr(v.bridge(), rmac) }},
{"create " + v.bridge(), func() error { return h.CreateBridge(v.bridge(), l3MTU, 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, l3MTU) }},
{"attach " + v.vxlan(), func() error { return h.SetMaster(v.vxlan(), v.bridge()) }},

View file

@ -43,12 +43,8 @@ func (f *fakeHost) CreateVRF(name string, table uint32) error {
return f.record(fmt.Sprintf("vrf %s table %d", name, table))
}
func (f *fakeHost) CreateBridge(name string, mtu int) error {
return f.record(fmt.Sprintf("bridge %s mtu %d", name, mtu))
}
func (f *fakeHost) SetHardwareAddr(name string, mac net.HardwareAddr) error {
return f.record(fmt.Sprintf("mac %s %s", name, mac))
func (f *fakeHost) CreateBridge(name string, mtu int, mac net.HardwareAddr) error {
return f.record(fmt.Sprintf("bridge %s mtu %d mac %s", name, mtu, mac))
}
func (f *fakeHost) SetMaster(iface, master string) error {
@ -123,8 +119,7 @@ func TestCreateL3FollowsTheLabRecipe(t *testing.T) {
want := []string{
"vtep br-000000",
"vrf vrf-s7 table 2700",
"bridge brl3-s7 mtu 1500",
"mac brl3-s7 02:02:c0:a8:0e:0b",
"bridge brl3-s7 mtu 1500 mac 02:02:c0:a8:0e:0b",
"master brl3-s7 vrf-s7",
"vxlan vxl3-s7 id 2700 dev br-000000 mtu 1500",
"master vxl3-s7 brl3-s7",

View file

@ -1,14 +1,17 @@
package netif
import (
"net"
"github.com/vishvananda/netlink"
)
func CreateBridge(name string, mtu int) error {
func CreateBridge(name string, mtu int, mac net.HardwareAddr) error {
br := &netlink.Bridge{
LinkAttrs: netlink.LinkAttrs{
Name: name,
MTU: mtu,
Name: name,
MTU: mtu,
HardwareAddr: mac,
},
}

View file

@ -1,8 +1,6 @@
package netif
import (
"net"
"github.com/vishvananda/netlink"
)
@ -21,11 +19,3 @@ func LinkSetDown(name string) error {
}
return netlink.LinkSetDown(link)
}
func LinkSetHardwareAddr(name string, mac net.HardwareAddr) error {
link, err := netlink.LinkByName(name)
if err != nil {
return err
}
return netlink.LinkSetHardwareAddr(link, mac)
}

View file

@ -86,14 +86,9 @@ func createSubnet(db *badger.DB, subnetName string, d subnetData, backend dhcpba
}
if err := netns.Call(d.vpc, func() error {
if err := netif.CreateBridge(d.bridge, 1500); err != nil {
if err := netif.CreateBridge(d.bridge, 1500, gatewayMAC); err != nil {
return fmt.Errorf("create bridge: %w", err)
}
if gatewayMAC != nil {
if err := netif.LinkSetHardwareAddr(d.bridge, gatewayMAC); err != nil {
return fmt.Errorf("set gateway mac %s: %w", gatewayMAC, err)
}
}
return netif.BridgeSetMaster(vethI, d.bridge)
}); err != nil {
return fmt.Errorf("setup bridge in netns: %w", err)
@ -146,7 +141,7 @@ func createSubnet(db *badger.DB, subnetName string, d subnetData, backend dhcpba
func setupVxlanHost(d subnetData, vethE string) error {
vxlanIface := fmt.Sprintf("vxlan-%d", d.vxlanID)
if err := netif.CreateBridge(d.bridge, 1500); err != nil {
if err := netif.CreateBridge(d.bridge, 1500, nil); err != nil {
return fmt.Errorf("create bridge: %w", err)
}
if err := netif.CreateVxlan(vxlanIface, d.vxlanID, d.localIface, 1500); err != nil {

View file

@ -27,7 +27,7 @@ func CreateVPC(db *badger.DB, name string, cfg *configuration.Config) error {
}
if err := netns.Call(name, func() error {
return netif.CreateBridge("br-public", 1500)
return netif.CreateBridge("br-public", 1500, nil)
}); err != nil {
return err
}