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
d1b50d546c
commit
8cb5117cb2
37 changed files with 518 additions and 24 deletions
|
|
@ -14,8 +14,6 @@ import (
|
|||
"github.com/dgraph-io/badger/v4"
|
||||
)
|
||||
|
||||
const l3MTU = 1500
|
||||
|
||||
var (
|
||||
transitHost = &net.IPNet{IP: net.IPv4(169, 254, 0, 1).To4(), Mask: net.CIDRMask(30, 32)}
|
||||
transitNetns = &net.IPNet{IP: net.IPv4(169, 254, 0, 2).To4(), Mask: net.CIDRMask(30, 32)}
|
||||
|
|
@ -76,6 +74,7 @@ func createL3(h host, cfg *configuration.Config, v l3VPC) error {
|
|||
if err != nil {
|
||||
return fmt.Errorf("vtep: %w", err)
|
||||
}
|
||||
mtu := cfg.Network.VM()
|
||||
rmac, err := RouterMAC(vtep)
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
@ -85,12 +84,12 @@ func createL3(h host, cfg *configuration.Config, v l3VPC) error {
|
|||
run func() error
|
||||
}{
|
||||
{"create " + v.vrf(), func() error { return h.CreateVRF(v.vrf(), v.vni) }},
|
||||
{"create " + v.bridge(), func() error { return h.CreateBridge(v.bridge(), l3MTU, rmac) }},
|
||||
{"create " + v.bridge(), func() error { return h.CreateBridge(v.bridge(), mtu, rmac) }},
|
||||
{"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, mtu) }},
|
||||
{"attach " + v.vxlan(), func() error { return h.SetMaster(v.vxlan(), v.bridge()) }},
|
||||
{"set up " + v.vxlan(), func() error { return h.LinkUp("", v.vxlan()) }},
|
||||
{"create " + v.vethHost(), func() error { return h.CreateVeth(v.vethHost(), v.vethNetns(), v.netns, l3MTU) }},
|
||||
{"create " + v.vethHost(), func() error { return h.CreateVeth(v.vethHost(), v.vethNetns(), v.netns, mtu) }},
|
||||
{"attach " + v.vethHost(), func() error { return h.SetMaster(v.vethHost(), v.vrf()) }},
|
||||
{"address " + v.vethHost(), func() error { return h.AddrAdd("", v.vethHost(), transitHost) }},
|
||||
{"set up " + v.vethHost(), func() error { return h.LinkUp("", v.vethHost()) }},
|
||||
|
|
|
|||
|
|
@ -113,18 +113,20 @@ func labL3(t *testing.T) l3VPC {
|
|||
|
||||
func TestCreateL3FollowsTheLabRecipe(t *testing.T) {
|
||||
f := &fakeHost{}
|
||||
if err := createL3(f, bgpConfig(), labL3(t)); err != nil {
|
||||
cfg := bgpConfig()
|
||||
cfg.Network.MTUVM = 1450
|
||||
if err := createL3(f, cfg, labL3(t)); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
want := []string{
|
||||
"vtep br-000000",
|
||||
"vrf vrf-s7 table 2700",
|
||||
"bridge brl3-s7 mtu 1500 mac 02:02:c0:a8:0e:0b",
|
||||
"bridge brl3-s7 mtu 1450 mac 02:02:c0:a8:0e:0b",
|
||||
"master brl3-s7 vrf-s7",
|
||||
"vxlan vxl3-s7 id 2700 dev br-000000 mtu 1500",
|
||||
"vxlan vxl3-s7 id 2700 dev br-000000 mtu 1450",
|
||||
"master vxl3-s7 brl3-s7",
|
||||
"up [] vxl3-s7",
|
||||
"veth l3-s7-o peer l3-s7-i netns vp-s7 mtu 1500",
|
||||
"veth l3-s7-o peer l3-s7-i netns vp-s7 mtu 1450",
|
||||
"master l3-s7-o vrf-s7",
|
||||
"addr [] l3-s7-o 169.254.0.1/30",
|
||||
"up [] l3-s7-o",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue