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
42d763f15e
commit
853a1b8377
10 changed files with 99 additions and 91 deletions
|
|
@ -4,9 +4,9 @@ import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"net"
|
"net"
|
||||||
"strings"
|
"strings"
|
||||||
)
|
|
||||||
|
|
||||||
const maxVNI = 1<<24 - 1
|
"git.g3e.fr/syonad/two/internal/netif"
|
||||||
|
)
|
||||||
|
|
||||||
type Base struct {
|
type Base struct {
|
||||||
ASN uint32
|
ASN uint32
|
||||||
|
|
@ -116,7 +116,7 @@ func (v VRF) validate() error {
|
||||||
if err := v.validateName(); err != nil {
|
if err := v.validateName(); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
if v.L3VNI == 0 || v.L3VNI > maxVNI {
|
if v.L3VNI == 0 || v.L3VNI > netif.MaxVNI {
|
||||||
return fmt.Errorf("frr: l3vni %d does not fit in 24 bits", v.L3VNI)
|
return fmt.Errorf("frr: l3vni %d does not fit in 24 bits", v.L3VNI)
|
||||||
}
|
}
|
||||||
if v.VTEP.To4() == nil {
|
if v.VTEP.To4() == nil {
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@ import (
|
||||||
|
|
||||||
configuration "git.g3e.fr/syonad/two/internal/config/agent"
|
configuration "git.g3e.fr/syonad/two/internal/config/agent"
|
||||||
"git.g3e.fr/syonad/two/internal/frr"
|
"git.g3e.fr/syonad/two/internal/frr"
|
||||||
|
"git.g3e.fr/syonad/two/internal/netif"
|
||||||
"git.g3e.fr/syonad/two/pkg/db/kv"
|
"git.g3e.fr/syonad/two/pkg/db/kv"
|
||||||
|
|
||||||
"github.com/dgraph-io/badger/v4"
|
"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) vethHost() string { return "l3-" + v.id + "-o" }
|
||||||
func (v l3VPC) vethNetns() string { return "l3-" + v.id + "-i" }
|
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) {
|
func bgpASN(cfg *configuration.Config) (uint32, error) {
|
||||||
if cfg == nil || !cfg.BGP.Enabled() {
|
if cfg == nil || !cfg.BGP.Enabled() {
|
||||||
return 0, fmt.Errorf("the vpc has an l3vni but the agent configuration has no bgp section")
|
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 {
|
if err != nil {
|
||||||
return fmt.Errorf("vtep: %w", err)
|
return fmt.Errorf("vtep: %w", err)
|
||||||
}
|
}
|
||||||
rmac, err := routerMAC(vtep)
|
rmac, err := RouterMAC(vtep)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
@ -181,5 +174,5 @@ func LoadRouting(db *badger.DB, vpcName string) (Routing, bool, error) {
|
||||||
}
|
}
|
||||||
|
|
||||||
func RouterMAC(vtep net.IP) (net.HardwareAddr, 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) {
|
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" {
|
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é")
|
t.Error("VTEP IPv6 accepté")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,14 @@
|
||||||
package l3vni
|
package l3vni
|
||||||
|
|
||||||
import "fmt"
|
import (
|
||||||
|
"fmt"
|
||||||
|
|
||||||
const maxL3VNI = 1<<24 - 1
|
"git.g3e.fr/syonad/two/internal/netif"
|
||||||
|
)
|
||||||
|
|
||||||
func Valid(id uint32) error {
|
func Valid(id uint32) error {
|
||||||
if id == 0 || id > maxL3VNI {
|
if id == 0 || id > netif.MaxVNI {
|
||||||
return fmt.Errorf("l3vni %d does not fit in 24 bits (1-%d)", id, maxL3VNI)
|
return fmt.Errorf("l3vni %d does not fit in 24 bits (1-%d)", id, netif.MaxVNI)
|
||||||
}
|
}
|
||||||
if id >= 253 && id <= 255 {
|
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)
|
return fmt.Errorf("l3vni %d is reserved: it is also the routing table id, and tables 253-255 belong to the kernel", id)
|
||||||
|
|
|
||||||
21
internal/netif/mac.go
Normal file
21
internal/netif/mac.go
Normal file
|
|
@ -0,0 +1,21 @@
|
||||||
|
package netif
|
||||||
|
|
||||||
|
import (
|
||||||
|
"fmt"
|
||||||
|
"net"
|
||||||
|
)
|
||||||
|
|
||||||
|
const (
|
||||||
|
locallyAdministered byte = 0x02
|
||||||
|
|
||||||
|
RoleRouter byte = 0x02
|
||||||
|
RoleHostGateway byte = 0x03
|
||||||
|
)
|
||||||
|
|
||||||
|
func HostMAC(role byte, 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{locallyAdministered, role, ip[0], ip[1], ip[2], ip[3]}, nil
|
||||||
|
}
|
||||||
60
internal/netif/mac_test.go
Normal file
60
internal/netif/mac_test.go
Normal file
|
|
@ -0,0 +1,60 @@
|
||||||
|
package netif
|
||||||
|
|
||||||
|
import (
|
||||||
|
"net"
|
||||||
|
"testing"
|
||||||
|
)
|
||||||
|
|
||||||
|
func TestHostMAC(t *testing.T) {
|
||||||
|
cases := []struct {
|
||||||
|
role byte
|
||||||
|
vtep string
|
||||||
|
want string
|
||||||
|
}{
|
||||||
|
{RoleHostGateway, "192.168.14.11", "02:03:c0:a8:0e:0b"},
|
||||||
|
{RoleHostGateway, "192.168.14.12", "02:03:c0:a8:0e:0c"},
|
||||||
|
{RoleHostGateway, "10.0.0.1", "02:03:0a:00:00:01"},
|
||||||
|
{RoleRouter, "192.168.14.11", "02:02:c0:a8:0e:0b"},
|
||||||
|
}
|
||||||
|
for _, c := range cases {
|
||||||
|
got, err := HostMAC(c.role, net.ParseIP(c.vtep))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("rôle %#x, VTEP %s : erreur inattendue %v", c.role, c.vtep, err)
|
||||||
|
}
|
||||||
|
if got.String() != c.want {
|
||||||
|
t.Errorf("rôle %#x, VTEP %s : %s, %s attendu", c.role, c.vtep, got, c.want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHostMACIsLocalUnicast(t *testing.T) {
|
||||||
|
for _, role := range []byte{RoleRouter, RoleHostGateway} {
|
||||||
|
got, err := HostMAC(role, net.ParseIP("192.168.14.11"))
|
||||||
|
if err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
if got[0]&0x02 == 0 {
|
||||||
|
t.Errorf("%s : bit « administrée localement » absent", got)
|
||||||
|
}
|
||||||
|
if got[0]&0x01 != 0 {
|
||||||
|
t.Errorf("%s : MAC de groupe (multicast)", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHostMACRolesDifferOnTheSameHost(t *testing.T) {
|
||||||
|
if RoleRouter == RoleHostGateway {
|
||||||
|
t.Fatalf("rôles identiques : %#x", RoleRouter)
|
||||||
|
}
|
||||||
|
if RoleRouter != 0x02 || RoleHostGateway != 0x03 {
|
||||||
|
t.Errorf("rôles %#x / %#x, 0x02 / 0x03 attendus (valeurs publiées dans la doc)", RoleRouter, RoleHostGateway)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestHostMACRejectsANonIPv4VTEP(t *testing.T) {
|
||||||
|
for _, vtep := range []net.IP{nil, net.ParseIP("fd00::1")} {
|
||||||
|
if mac, err := HostMAC(RoleHostGateway, vtep); err == nil {
|
||||||
|
t.Errorf("VTEP %v accepté : %s", vtep, mac)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -8,6 +8,8 @@ import (
|
||||||
"github.com/vishvananda/netlink"
|
"github.com/vishvananda/netlink"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
const MaxVNI = 1<<24 - 1
|
||||||
|
|
||||||
const (
|
const (
|
||||||
scopeUniverse = 0
|
scopeUniverse = 0
|
||||||
addressSecondary = 0x01
|
addressSecondary = 0x01
|
||||||
|
|
|
||||||
|
|
@ -80,7 +80,7 @@ func createSubnet(db *badger.DB, subnetName string, d subnetData, backend dhcpba
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return fmt.Errorf("vtep of %s: %w", d.localIface, err)
|
return fmt.Errorf("vtep of %s: %w", d.localIface, err)
|
||||||
}
|
}
|
||||||
if gatewayMAC, err = hostGatewayMAC(vtep); err != nil {
|
if gatewayMAC, err = netif.HostMAC(netif.RoleHostGateway, vtep); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
package subnet
|
|
||||||
|
|
||||||
import (
|
|
||||||
"fmt"
|
|
||||||
"net"
|
|
||||||
)
|
|
||||||
|
|
||||||
const (
|
|
||||||
roleHostGateway = 0x03
|
|
||||||
locallyAdministered = 0x02
|
|
||||||
)
|
|
||||||
|
|
||||||
func hostGatewayMAC(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{locallyAdministered, roleHostGateway, ip[0], ip[1], ip[2], ip[3]}, nil
|
|
||||||
}
|
|
||||||
|
|
@ -1,51 +0,0 @@
|
||||||
package subnet
|
|
||||||
|
|
||||||
import (
|
|
||||||
"net"
|
|
||||||
"testing"
|
|
||||||
)
|
|
||||||
|
|
||||||
func TestHostGatewayMAC(t *testing.T) {
|
|
||||||
cases := map[string]string{
|
|
||||||
"192.168.14.11": "02:03:c0:a8:0e:0b",
|
|
||||||
"192.168.14.12": "02:03:c0:a8:0e:0c",
|
|
||||||
"10.0.0.1": "02:03:0a:00:00:01",
|
|
||||||
}
|
|
||||||
for vtep, want := range cases {
|
|
||||||
got, err := hostGatewayMAC(net.ParseIP(vtep))
|
|
||||||
if err != nil {
|
|
||||||
t.Fatalf("VTEP %s : erreur inattendue %v", vtep, err)
|
|
||||||
}
|
|
||||||
if got.String() != want {
|
|
||||||
t.Errorf("VTEP %s : %s, %s attendu", vtep, got, want)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestHostGatewayMACIsLocalUnicast(t *testing.T) {
|
|
||||||
got, err := hostGatewayMAC(net.ParseIP("192.168.14.11"))
|
|
||||||
if err != nil {
|
|
||||||
t.Fatal(err)
|
|
||||||
}
|
|
||||||
if got[0]&0x02 == 0 {
|
|
||||||
t.Errorf("%s : bit « administrée localement » absent", got)
|
|
||||||
}
|
|
||||||
if got[0]&0x01 != 0 {
|
|
||||||
t.Errorf("%s : MAC de groupe (multicast)", got)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestHostGatewayMACDiffersFromTheRouterMACOfTheSameHost(t *testing.T) {
|
|
||||||
got, _ := hostGatewayMAC(net.ParseIP("192.168.14.11"))
|
|
||||||
if got.String() == "02:02:c0:a8:0e:0b" {
|
|
||||||
t.Errorf("%s : même MAC que la RMAC du L3VNI de cet hôte", got)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func TestHostGatewayMACRejectsANonIPv4VTEP(t *testing.T) {
|
|
||||||
for _, vtep := range []net.IP{nil, net.ParseIP("fd00::1")} {
|
|
||||||
if mac, err := hostGatewayMAC(vtep); err == nil {
|
|
||||||
t.Errorf("VTEP %v accepté : %s", vtep, mac)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue