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
52
internal/config/agent/network.go
Normal file
52
internal/config/agent/network.go
Normal file
|
|
@ -0,0 +1,52 @@
|
|||
package configuration
|
||||
|
||||
import "fmt"
|
||||
|
||||
const (
|
||||
MTUVM = 1500
|
||||
MinMTUVM = 1280
|
||||
MTUUnderlay = 9000
|
||||
VXLANOverhead = 50
|
||||
)
|
||||
|
||||
type Network struct {
|
||||
MTUVM int `mapstructure:"mtu_vm"`
|
||||
AllowMTUVMBelow1500 bool `mapstructure:"allow_mtu_vm_below_1500"`
|
||||
AllowMTUUnderlayBelow9000 bool `mapstructure:"allow_mtu_underlay_below_9000"`
|
||||
}
|
||||
|
||||
func (n Network) VM() int {
|
||||
if n.MTUVM == 0 {
|
||||
return MTUVM
|
||||
}
|
||||
return n.MTUVM
|
||||
}
|
||||
|
||||
func (n Network) Validate() error {
|
||||
switch {
|
||||
case n.MTUVM > MTUVM:
|
||||
return fmt.Errorf("network.mtu_vm %d is above %d", n.MTUVM, MTUVM)
|
||||
case n.MTUVM < MinMTUVM:
|
||||
return fmt.Errorf("network.mtu_vm %d is below the minimum %d", n.MTUVM, MinMTUVM)
|
||||
case n.MTUVM < MTUVM && !n.AllowMTUVMBelow1500:
|
||||
return fmt.Errorf("network.mtu_vm %d is below %d: set network.allow_mtu_vm_below_1500 to allow it", n.MTUVM, MTUVM)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (n Network) CheckUnderlay(iface string, mtu int) error {
|
||||
if mtu != MTUUnderlay && !n.AllowMTUUnderlayBelow9000 {
|
||||
return fmt.Errorf("underlay %s has mtu %d, %d expected: set network.allow_mtu_underlay_below_9000 to allow another value", iface, mtu, MTUUnderlay)
|
||||
}
|
||||
if mtu < n.VM()+VXLANOverhead {
|
||||
return fmt.Errorf("underlay %s has mtu %d, below network.mtu_vm %d plus %d bytes of vxlan header", iface, mtu, n.VM(), VXLANOverhead)
|
||||
}
|
||||
return nil
|
||||
}
|
||||
|
||||
func (n Network) CheckBridge(iface string, mtu int) error {
|
||||
if mtu < n.VM() {
|
||||
return fmt.Errorf("bridge %s has mtu %d, below network.mtu_vm %d", iface, mtu, n.VM())
|
||||
}
|
||||
return nil
|
||||
}
|
||||
98
internal/config/agent/network_test.go
Normal file
98
internal/config/agent/network_test.go
Normal file
|
|
@ -0,0 +1,98 @@
|
|||
package configuration
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestLoadConfig_NetworkDefauts(t *testing.T) {
|
||||
cfg, err := LoadConfig(writeYAML(t, ""))
|
||||
if err != nil {
|
||||
t.Fatalf("LoadConfig a échoué : %v", err)
|
||||
}
|
||||
if cfg.Network.MTUVM != 1500 || cfg.Network.AllowMTUVMBelow1500 || cfg.Network.AllowMTUUnderlayBelow9000 {
|
||||
t.Errorf("network par défaut : %+v", cfg.Network)
|
||||
}
|
||||
}
|
||||
|
||||
func TestLoadConfig_MTUVMRefuseSansOption(t *testing.T) {
|
||||
if _, err := LoadConfig(writeYAML(t, "network:\n mtu_vm: 1450\n")); err == nil || !strings.Contains(err.Error(), "allow_mtu_vm_below_1500") {
|
||||
t.Errorf("mtu_vm 1450 sans option : %v", err)
|
||||
}
|
||||
cfg, err := LoadConfig(writeYAML(t, "network:\n mtu_vm: 1450\n allow_mtu_vm_below_1500: true\n"))
|
||||
if err != nil || cfg.Network.MTUVM != 1450 {
|
||||
t.Errorf("mtu_vm 1450 avec option : %v, %+v", err, cfg)
|
||||
}
|
||||
}
|
||||
|
||||
func TestNetworkValidate(t *testing.T) {
|
||||
cases := []struct {
|
||||
n Network
|
||||
ok bool
|
||||
}{
|
||||
{Network{MTUVM: 1500}, true},
|
||||
{Network{MTUVM: 1501}, false},
|
||||
{Network{MTUVM: 9000, AllowMTUVMBelow1500: true}, false},
|
||||
{Network{MTUVM: 1499}, false},
|
||||
{Network{MTUVM: 1499, AllowMTUVMBelow1500: true}, true},
|
||||
{Network{MTUVM: 1280, AllowMTUVMBelow1500: true}, true},
|
||||
{Network{MTUVM: 1279, AllowMTUVMBelow1500: true}, false},
|
||||
{Network{MTUVM: 0, AllowMTUVMBelow1500: true}, false},
|
||||
}
|
||||
for _, c := range cases {
|
||||
if err := c.n.Validate(); (err == nil) != c.ok {
|
||||
t.Errorf("Validate(%+v) = %v", c.n, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestNetworkCheckUnderlay(t *testing.T) {
|
||||
n := Network{MTUVM: 1500}
|
||||
if err := n.CheckUnderlay("br-000000", 9000); err != nil {
|
||||
t.Errorf("9000 : %v", err)
|
||||
}
|
||||
for _, m := range []int{9216, 8999, 1550} {
|
||||
if err := n.CheckUnderlay("br-000000", m); err == nil || !strings.Contains(err.Error(), "allow_mtu_underlay_below_9000") {
|
||||
t.Errorf("%d sans option : %v", m, err)
|
||||
}
|
||||
}
|
||||
n.AllowMTUUnderlayBelow9000 = true
|
||||
if err := n.CheckUnderlay("br-000000", 1550); err != nil {
|
||||
t.Errorf("1550 avec option : %v", err)
|
||||
}
|
||||
if err := n.CheckUnderlay("br-000000", 1549); err == nil || !strings.Contains(err.Error(), "vxlan header") {
|
||||
t.Errorf("1549 avec option, mtu_vm 1500 : %v", err)
|
||||
}
|
||||
n.MTUVM = 1400
|
||||
if err := n.CheckUnderlay("br-000000", 1450); err != nil {
|
||||
t.Errorf("1450 pour mtu_vm 1400 : %v", err)
|
||||
}
|
||||
if err := (Network{MTUVM: 8960}).CheckUnderlay("br-000000", 9000); err == nil {
|
||||
t.Error("mtu_vm 8960 + 50 dépasse 9000")
|
||||
}
|
||||
}
|
||||
|
||||
func TestNetworkVMIs1500WhenUnset(t *testing.T) {
|
||||
if got := (Network{}).VM(); got != 1500 {
|
||||
t.Errorf("VM() d'une section vide = %d", got)
|
||||
}
|
||||
if got := (Network{MTUVM: 1400}).VM(); got != 1400 {
|
||||
t.Errorf("VM() = %d, attendu 1400", got)
|
||||
}
|
||||
if err := (Network{}).CheckUnderlay("br-000000", 1549); err == nil {
|
||||
t.Error("section vide : 1549 doit être refusé (mtu_vm 1500 + 50)")
|
||||
}
|
||||
}
|
||||
|
||||
func TestNetworkCheckBridge(t *testing.T) {
|
||||
n := Network{MTUVM: 1500}
|
||||
if err := n.CheckBridge("br-lan", 1500); err != nil {
|
||||
t.Errorf("1500 : %v", err)
|
||||
}
|
||||
if err := n.CheckBridge("br-000000", 9000); err != nil {
|
||||
t.Errorf("9000 : %v", err)
|
||||
}
|
||||
if err := n.CheckBridge("br-lan", 1499); err == nil || !strings.Contains(err.Error(), "br-lan") {
|
||||
t.Errorf("1499 : %v", err)
|
||||
}
|
||||
}
|
||||
|
|
@ -55,6 +55,7 @@ type Config struct {
|
|||
Enabled bool `mapstructure:"enabled"`
|
||||
IntervalSeconds int `mapstructure:"interval_seconds"`
|
||||
} `mapstructure:"watchdog"`
|
||||
Network Network `mapstructure:"network"`
|
||||
BGP BGP `mapstructure:"bgp"`
|
||||
DefaultInterface string `mapstructure:"default_interface"`
|
||||
Interfaces map[string]string `mapstructure:"interfaces"`
|
||||
|
|
@ -90,6 +91,9 @@ func LoadConfig(path string) (*Config, error) {
|
|||
v.SetDefault("default_interface", "br-000000")
|
||||
v.SetDefault("logger.level", "info")
|
||||
v.SetDefault("logger.debug", false)
|
||||
v.SetDefault("network.mtu_vm", MTUVM)
|
||||
v.SetDefault("network.allow_mtu_vm_below_1500", false)
|
||||
v.SetDefault("network.allow_mtu_underlay_below_9000", false)
|
||||
|
||||
if err := v.ReadInConfig(); err != nil && !errors.Is(err, os.ErrNotExist) {
|
||||
return nil, fmt.Errorf("read %s: %w", path, err)
|
||||
|
|
@ -99,6 +103,9 @@ func LoadConfig(path string) (*Config, error) {
|
|||
if err := v.Unmarshal(&cfg); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
if err := cfg.Network.Validate(); err != nil {
|
||||
return nil, fmt.Errorf("%s: %w", path, err)
|
||||
}
|
||||
|
||||
return &cfg, nil
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue