f-56: agent: MTU unique network.mtu_vm, underlay à 9000 contrôlé à la création, option DHCP 26 et host_mtu #56
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
8eb77b302b
commit
8639c4727f
37 changed files with 518 additions and 24 deletions
|
|
@ -45,3 +45,7 @@ func (m mockCmd) Prepare(db *badger.DB, cfg *configuration.Config) error {
|
|||
func (m mockCmd) Execute(db *badger.DB, cfg *configuration.Config) error {
|
||||
return m.executeFn(db, cfg)
|
||||
}
|
||||
|
||||
func init() {
|
||||
LinkMTU = func(string) (int, error) { return 9000, nil }
|
||||
}
|
||||
|
|
|
|||
88
internal/dispatcher/agent/mtu_test.go
Normal file
88
internal/dispatcher/agent/mtu_test.go
Normal file
|
|
@ -0,0 +1,88 @@
|
|||
package dispatcher
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
|
||||
"git.g3e.fr/syonad/two/pkg/db/kv"
|
||||
)
|
||||
|
||||
func withLinkMTU(t *testing.T, mtus map[string]int) {
|
||||
t.Helper()
|
||||
previous := LinkMTU
|
||||
LinkMTU = func(name string) (int, error) { return mtus[name], nil }
|
||||
t.Cleanup(func() { LinkMTU = previous })
|
||||
}
|
||||
|
||||
func TestCreateSubnetCommand_Prepare_VxlanRefusesAnUnderlayOtherThan9000(t *testing.T) {
|
||||
withLinkMTU(t, map[string]int{"br-vms": 1500, "br-default": 9000})
|
||||
_, db := newTestDispatcher(t)
|
||||
kv.AddInDB(db, "vpc/vpc-1/state", "running")
|
||||
|
||||
cmd := CreateSubnetCommand{Name: "sn-1", VPC: "vpc-1", VxlanID: 100, IfaceType: "vms", CIDR: "10.0.0.0/24"}
|
||||
err := cmd.Prepare(db, testCfg())
|
||||
if err == nil || !strings.Contains(err.Error(), "underlay br-vms has mtu 1500") {
|
||||
t.Fatalf("underlay br-vms à 1500 : %v", err)
|
||||
}
|
||||
if _, err := kv.GetFromDB(db, "subnet/sn-1/state"); err == nil {
|
||||
t.Error("aucune clé ne doit être écrite après un refus")
|
||||
}
|
||||
|
||||
cmd.IfaceType = ""
|
||||
if err := cmd.Prepare(db, testCfg()); err != nil {
|
||||
t.Errorf("default_interface à 9000 : %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCreateSubnetCommand_Prepare_VxlanUnderlayBelow9000WithTheOption(t *testing.T) {
|
||||
withLinkMTU(t, map[string]int{"br-vms": 1549})
|
||||
cfg := testCfg()
|
||||
cfg.Network.AllowMTUUnderlayBelow9000 = true
|
||||
_, db := newTestDispatcher(t)
|
||||
kv.AddInDB(db, "vpc/vpc-1/state", "running")
|
||||
|
||||
cmd := CreateSubnetCommand{Name: "sn-1", VPC: "vpc-1", VxlanID: 100, IfaceType: "vms", CIDR: "10.0.0.0/24"}
|
||||
if err := cmd.Prepare(db, cfg); err == nil || !strings.Contains(err.Error(), "vxlan header") {
|
||||
t.Fatalf("1549 pour mtu_vm 1500 : %v", err)
|
||||
}
|
||||
cfg.Network.MTUVM = 1499
|
||||
if err := cmd.Prepare(db, cfg); err != nil {
|
||||
t.Errorf("1549 pour mtu_vm 1499 : %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCreateSubnetCommand_Prepare_BridgeChecksTheBridgeWithoutVxlanHeader(t *testing.T) {
|
||||
withLinkMTU(t, map[string]int{"br-vms": 1500, "br-default": 1499})
|
||||
_, db := newTestDispatcher(t)
|
||||
kv.AddInDB(db, "vpc/vpc-1/state", "running")
|
||||
|
||||
ok := CreateSubnetCommand{Name: "sn-1", VPC: "vpc-1", Mode: "bridge", IfaceType: "vms", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24"}
|
||||
if err := ok.Prepare(db, testCfg()); err != nil {
|
||||
t.Errorf("bridge br-vms à 1500 : %v", err)
|
||||
}
|
||||
small := CreateSubnetCommand{Name: "sn-2", VPC: "vpc-1", Mode: "bridge", InterfaceIP: "10.0.1.1", CIDR: "10.0.1.0/24"}
|
||||
if err := small.Prepare(db, testCfg()); err == nil || !strings.Contains(err.Error(), "bridge br-default has mtu 1499") {
|
||||
t.Errorf("bridge br-default à 1499 : %v", err)
|
||||
}
|
||||
if _, err := kv.GetFromDB(db, "subnet/sn-2/state"); err == nil {
|
||||
t.Error("aucune clé ne doit être écrite après un refus")
|
||||
}
|
||||
}
|
||||
|
||||
func TestCreateVPCCommand_Prepare_L3VNIChecksTheUnderlay(t *testing.T) {
|
||||
cfg := bgpConfig()
|
||||
cfg.DefaultInterface = "br-000000"
|
||||
withLinkMTU(t, map[string]int{"br-000000": 1500})
|
||||
_, db := newTestDispatcher(t)
|
||||
|
||||
err := (CreateVPCCommand{Name: "vpc-1", CIDR: "10.0.0.0/16", L3VNI: 4001}).Prepare(db, cfg)
|
||||
if err == nil || !strings.Contains(err.Error(), "underlay br-000000") {
|
||||
t.Fatalf("underlay br-000000 à 1500 : %v", err)
|
||||
}
|
||||
if _, err := kv.GetFromDB(db, "vpc/vpc-1/state"); err == nil {
|
||||
t.Error("aucune clé ne doit être écrite après un refus")
|
||||
}
|
||||
if err := (CreateVPCCommand{Name: "vpc-2", CIDR: "10.0.0.0/16"}).Prepare(db, cfg); err != nil {
|
||||
t.Errorf("un VPC sans l3vni ne contrôle pas l'underlay : %v", err)
|
||||
}
|
||||
}
|
||||
|
|
@ -63,6 +63,16 @@ func (c CreateSubnetCommand) Prepare(db *badger.DB, cfg *configuration.Config) e
|
|||
if !ok {
|
||||
localIface = cfg.DefaultInterface
|
||||
}
|
||||
switch c.Mode {
|
||||
case subnet.ModeVxlan:
|
||||
if err := checkUnderlay(cfg, localIface); err != nil {
|
||||
return err
|
||||
}
|
||||
case subnet.ModeBridge:
|
||||
if err := checkBridge(cfg, localIface); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
state.Set(db, c.Key(), state.Creating)
|
||||
kv.AddInDB(db, "subnet/"+c.Name+"/vpc", c.VPC)
|
||||
kv.AddInDB(db, "subnet/"+c.Name+"/mode", c.Mode)
|
||||
|
|
|
|||
|
|
@ -9,6 +9,7 @@ import (
|
|||
|
||||
configuration "git.g3e.fr/syonad/two/internal/config/agent"
|
||||
"git.g3e.fr/syonad/two/internal/l3vni"
|
||||
"git.g3e.fr/syonad/two/internal/netif"
|
||||
"git.g3e.fr/syonad/two/internal/state"
|
||||
"git.g3e.fr/syonad/two/internal/vpc"
|
||||
"git.g3e.fr/syonad/two/pkg/db/kv"
|
||||
|
|
@ -34,6 +35,9 @@ func (c CreateVPCCommand) Prepare(db *badger.DB, cfg *configuration.Config) erro
|
|||
if err := c.checkL3VNI(db, cfg); err != nil {
|
||||
return err
|
||||
}
|
||||
if err := checkUnderlay(cfg, cfg.DefaultInterface); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
if err := kv.AddInDB(db, "vpc/"+c.Name+"/cidr", c.CIDR); err != nil {
|
||||
return err
|
||||
|
|
@ -46,6 +50,24 @@ func (c CreateVPCCommand) Prepare(db *badger.DB, cfg *configuration.Config) erro
|
|||
return state.Set(db, c.Key(), state.Creating)
|
||||
}
|
||||
|
||||
var LinkMTU = netif.LinkMTU
|
||||
|
||||
func checkUnderlay(cfg *configuration.Config, iface string) error {
|
||||
m, err := LinkMTU(iface)
|
||||
if err != nil {
|
||||
return fmt.Errorf("read mtu of underlay %s: %w", iface, err)
|
||||
}
|
||||
return cfg.Network.CheckUnderlay(iface, m)
|
||||
}
|
||||
|
||||
func checkBridge(cfg *configuration.Config, iface string) error {
|
||||
m, err := LinkMTU(iface)
|
||||
if err != nil {
|
||||
return fmt.Errorf("read mtu of bridge %s: %w", iface, err)
|
||||
}
|
||||
return cfg.Network.CheckBridge(iface, m)
|
||||
}
|
||||
|
||||
func (c CreateVPCCommand) checkL3VNI(db *badger.DB, cfg *configuration.Config) error {
|
||||
if err := l3vni.Valid(c.L3VNI); err != nil {
|
||||
return err
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue