f-41: netif: MAC des bridges posée à la création (course avec udev) #41
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
0679639b95
commit
ec7bf79e98
7 changed files with 16 additions and 37 deletions
|
|
@ -13,8 +13,7 @@ type host interface {
|
||||||
VTEPAddress(iface string) (net.IP, error)
|
VTEPAddress(iface string) (net.IP, error)
|
||||||
Sysctl(ns, key, value string) error
|
Sysctl(ns, key, value string) error
|
||||||
CreateVRF(name string, table uint32) error
|
CreateVRF(name string, table uint32) error
|
||||||
CreateBridge(name string, mtu int) error
|
CreateBridge(name string, mtu int, mac net.HardwareAddr) error
|
||||||
SetHardwareAddr(name string, mac net.HardwareAddr) error
|
|
||||||
SetMaster(iface, master string) error
|
SetMaster(iface, master string) error
|
||||||
CreateVxlan(name string, vni int, iface string, mtu int) error
|
CreateVxlan(name string, vni int, iface string, mtu int) error
|
||||||
CreateVeth(hostIf, nsIf, ns 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) 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) CreateBridge(name string, mtu int, mac net.HardwareAddr) error {
|
||||||
|
return netif.CreateBridge(name, mtu, mac)
|
||||||
func (system) SetHardwareAddr(name string, mac net.HardwareAddr) error {
|
|
||||||
return netif.LinkSetHardwareAddr(name, mac)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (system) SetMaster(iface, master string) error { return netif.BridgeSetMaster(iface, master) }
|
func (system) SetMaster(iface, master string) error { return netif.BridgeSetMaster(iface, master) }
|
||||||
|
|
|
||||||
|
|
@ -85,8 +85,7 @@ func createL3(h host, cfg *configuration.Config, v l3VPC) error {
|
||||||
run func() error
|
run func() error
|
||||||
}{
|
}{
|
||||||
{"create " + v.vrf(), func() error { return h.CreateVRF(v.vrf(), v.vni) }},
|
{"create " + v.vrf(), func() error { return h.CreateVRF(v.vrf(), v.vni) }},
|
||||||
{"create " + v.bridge(), func() error { return h.CreateBridge(v.bridge(), l3MTU) }},
|
{"create " + v.bridge(), func() error { return h.CreateBridge(v.bridge(), l3MTU, rmac) }},
|
||||||
{"set router mac on " + v.bridge(), func() error { return h.SetHardwareAddr(v.bridge(), rmac) }},
|
|
||||||
{"attach " + v.bridge(), func() error { return h.SetMaster(v.bridge(), v.vrf()) }},
|
{"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) }},
|
{"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()) }},
|
{"attach " + v.vxlan(), func() error { return h.SetMaster(v.vxlan(), v.bridge()) }},
|
||||||
|
|
|
||||||
|
|
@ -43,12 +43,8 @@ func (f *fakeHost) CreateVRF(name string, table uint32) error {
|
||||||
return f.record(fmt.Sprintf("vrf %s table %d", name, table))
|
return f.record(fmt.Sprintf("vrf %s table %d", name, table))
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *fakeHost) CreateBridge(name string, mtu int) error {
|
func (f *fakeHost) CreateBridge(name string, mtu int, mac net.HardwareAddr) error {
|
||||||
return f.record(fmt.Sprintf("bridge %s mtu %d", name, mtu))
|
return f.record(fmt.Sprintf("bridge %s mtu %d mac %s", name, mtu, mac))
|
||||||
}
|
|
||||||
|
|
||||||
func (f *fakeHost) SetHardwareAddr(name string, mac net.HardwareAddr) error {
|
|
||||||
return f.record(fmt.Sprintf("mac %s %s", name, mac))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func (f *fakeHost) SetMaster(iface, master string) error {
|
func (f *fakeHost) SetMaster(iface, master string) error {
|
||||||
|
|
@ -123,8 +119,7 @@ func TestCreateL3FollowsTheLabRecipe(t *testing.T) {
|
||||||
want := []string{
|
want := []string{
|
||||||
"vtep br-000000",
|
"vtep br-000000",
|
||||||
"vrf vrf-s7 table 2700",
|
"vrf vrf-s7 table 2700",
|
||||||
"bridge brl3-s7 mtu 1500",
|
"bridge brl3-s7 mtu 1500 mac 02:02:c0:a8:0e:0b",
|
||||||
"mac brl3-s7 02:02:c0:a8:0e:0b",
|
|
||||||
"master brl3-s7 vrf-s7",
|
"master brl3-s7 vrf-s7",
|
||||||
"vxlan vxl3-s7 id 2700 dev br-000000 mtu 1500",
|
"vxlan vxl3-s7 id 2700 dev br-000000 mtu 1500",
|
||||||
"master vxl3-s7 brl3-s7",
|
"master vxl3-s7 brl3-s7",
|
||||||
|
|
|
||||||
|
|
@ -1,14 +1,17 @@
|
||||||
package netif
|
package netif
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"net"
|
||||||
|
|
||||||
"github.com/vishvananda/netlink"
|
"github.com/vishvananda/netlink"
|
||||||
)
|
)
|
||||||
|
|
||||||
func CreateBridge(name string, mtu int) error {
|
func CreateBridge(name string, mtu int, mac net.HardwareAddr) error {
|
||||||
br := &netlink.Bridge{
|
br := &netlink.Bridge{
|
||||||
LinkAttrs: netlink.LinkAttrs{
|
LinkAttrs: netlink.LinkAttrs{
|
||||||
Name: name,
|
Name: name,
|
||||||
MTU: mtu,
|
MTU: mtu,
|
||||||
|
HardwareAddr: mac,
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,8 +1,6 @@
|
||||||
package netif
|
package netif
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"net"
|
|
||||||
|
|
||||||
"github.com/vishvananda/netlink"
|
"github.com/vishvananda/netlink"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
@ -21,11 +19,3 @@ func LinkSetDown(name string) error {
|
||||||
}
|
}
|
||||||
return netlink.LinkSetDown(link)
|
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)
|
|
||||||
}
|
|
||||||
|
|
|
||||||
|
|
@ -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 := 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)
|
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)
|
return netif.BridgeSetMaster(vethI, d.bridge)
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
return fmt.Errorf("setup bridge in netns: %w", err)
|
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 {
|
func setupVxlanHost(d subnetData, vethE string) error {
|
||||||
vxlanIface := fmt.Sprintf("vxlan-%d", d.vxlanID)
|
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)
|
return fmt.Errorf("create bridge: %w", err)
|
||||||
}
|
}
|
||||||
if err := netif.CreateVxlan(vxlanIface, d.vxlanID, d.localIface, 1500); err != nil {
|
if err := netif.CreateVxlan(vxlanIface, d.vxlanID, d.localIface, 1500); err != nil {
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ func CreateVPC(db *badger.DB, name string, cfg *configuration.Config) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
if err := netns.Call(name, func() error {
|
if err := netns.Call(name, func() error {
|
||||||
return netif.CreateBridge("br-public", 1500)
|
return netif.CreateBridge("br-public", 1500, nil)
|
||||||
}); err != nil {
|
}); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue