f-41: netif: HostMAC et MaxVNI partagés (RMAC, MAC de gateway, borne des VNI) #41
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
87e97c8be1
commit
387a082c02
10 changed files with 99 additions and 91 deletions
|
|
@ -7,6 +7,7 @@ import (
|
|||
|
||||
configuration "git.g3e.fr/syonad/two/internal/config/agent"
|
||||
"git.g3e.fr/syonad/two/internal/frr"
|
||||
"git.g3e.fr/syonad/two/internal/netif"
|
||||
"git.g3e.fr/syonad/two/pkg/db/kv"
|
||||
|
||||
"github.com/dgraph-io/badger/v4"
|
||||
|
|
@ -55,14 +56,6 @@ func (v l3VPC) vxlan() string { return "vxl3-" + v.id }
|
|||
func (v l3VPC) vethHost() string { return "l3-" + v.id + "-o" }
|
||||
func (v l3VPC) vethNetns() string { return "l3-" + v.id + "-i" }
|
||||
|
||||
func routerMAC(vtep net.IP) (net.HardwareAddr, error) {
|
||||
ip := vtep.To4()
|
||||
if ip == nil {
|
||||
return nil, fmt.Errorf("vtep %v is not an IPv4 address", vtep)
|
||||
}
|
||||
return net.HardwareAddr{0x02, 0x02, ip[0], ip[1], ip[2], ip[3]}, nil
|
||||
}
|
||||
|
||||
func bgpASN(cfg *configuration.Config) (uint32, error) {
|
||||
if cfg == nil || !cfg.BGP.Enabled() {
|
||||
return 0, fmt.Errorf("the vpc has an l3vni but the agent configuration has no bgp section")
|
||||
|
|
@ -79,7 +72,7 @@ func createL3(h host, cfg *configuration.Config, v l3VPC) error {
|
|||
if err != nil {
|
||||
return fmt.Errorf("vtep: %w", err)
|
||||
}
|
||||
rmac, err := routerMAC(vtep)
|
||||
rmac, err := RouterMAC(vtep)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
@ -181,5 +174,5 @@ func LoadRouting(db *badger.DB, vpcName string) (Routing, bool, error) {
|
|||
}
|
||||
|
||||
func RouterMAC(vtep net.IP) (net.HardwareAddr, error) {
|
||||
return routerMAC(vtep)
|
||||
return netif.HostMAC(netif.RoleRouter, vtep)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -220,11 +220,11 @@ func TestDeleteL3RequiresTheBGPSection(t *testing.T) {
|
|||
}
|
||||
|
||||
func TestRouterMAC(t *testing.T) {
|
||||
mac, err := routerMAC(net.ParseIP("192.168.14.11"))
|
||||
mac, err := RouterMAC(net.ParseIP("192.168.14.11"))
|
||||
if err != nil || mac.String() != "02:02:c0:a8:0e:0b" {
|
||||
t.Errorf("routerMAC = %v, %v", mac, err)
|
||||
t.Errorf("RouterMAC = %v, %v", mac, err)
|
||||
}
|
||||
if _, err := routerMAC(net.ParseIP("fd00::1")); err == nil {
|
||||
if _, err := RouterMAC(net.ParseIP("fd00::1")); err == nil {
|
||||
t.Error("VTEP IPv6 accepté")
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
package l3vni
|
||||
|
||||
import "fmt"
|
||||
import (
|
||||
"fmt"
|
||||
|
||||
const maxL3VNI = 1<<24 - 1
|
||||
"git.g3e.fr/syonad/two/internal/netif"
|
||||
)
|
||||
|
||||
func Valid(id uint32) error {
|
||||
if id == 0 || id > maxL3VNI {
|
||||
return fmt.Errorf("l3vni %d does not fit in 24 bits (1-%d)", id, maxL3VNI)
|
||||
if id == 0 || id > netif.MaxVNI {
|
||||
return fmt.Errorf("l3vni %d does not fit in 24 bits (1-%d)", id, netif.MaxVNI)
|
||||
}
|
||||
if id >= 253 && id <= 255 {
|
||||
return fmt.Errorf("l3vni %d is reserved: it is also the routing table id, and tables 253-255 belong to the kernel", id)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue