f-89: subnet: mode public_ip raccordé au bridge public comme bridge #89

Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
GnomeZworc 2026-10-30 00:59:30 +01:00
commit 46aad1e7c5
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632
8 changed files with 61 additions and 8 deletions

View file

@ -86,3 +86,21 @@ func TestCreateVPCCommand_Prepare_L3VNIChecksTheUnderlay(t *testing.T) {
t.Errorf("un VPC sans l3vni ne contrôle pas l'underlay : %v", err)
}
}
func TestCreateSubnetCommand_Prepare_PublicIPChecksThePublicBridge(t *testing.T) {
withLinkMTU(t, map[string]int{"br-vms": 9000, "br-public": 1499})
_, db := newTestDispatcher(t)
kv.AddInDB(db, "vpc/vpc-1/state", "running")
cmd := CreateSubnetCommand{Name: "sn-pub", VPC: "vpc-1", Mode: "public_ip", IfaceType: "vms", InterfaceIP: "203.0.113.254", CIDR: "203.0.113.0/24"}
err := cmd.Prepare(db, testCfg())
if err == nil || !strings.Contains(err.Error(), "br-public") {
t.Fatalf("bridge public à 1499 : %v", err)
}
if _, err := kv.GetFromDB(db, "subnet/sn-pub/state"); err == nil {
t.Error("aucune clé ne doit être écrite après un refus")
}
withLinkMTU(t, map[string]int{"br-public": 1500})
if err := cmd.Prepare(db, testCfg()); err != nil {
t.Errorf("bridge public à 1500 : %v", err)
}
}

View file

@ -64,12 +64,15 @@ func (c CreateSubnetCommand) Prepare(db *badger.DB, cfg *configuration.Config) e
if !ok {
localIface = cfg.DefaultInterface
}
if c.Mode == subnet.ModePublicIP {
localIface = cfg.PublicBridge()
}
switch c.Mode {
case subnet.ModeVxlan:
if err := checkUnderlay(cfg, localIface); err != nil {
return err
}
case subnet.ModeBridge:
case subnet.ModeBridge, subnet.ModePublicIP:
if err := checkBridge(cfg, localIface); err != nil {
return err
}

View file

@ -391,6 +391,23 @@ func TestCreateSubnetCommand_Prepare_AcceptsPublicIPMode(t *testing.T) {
if _, err := kv.GetFromDB(db, "subnet/sn-pub/vxlan_id"); err == nil {
t.Error("vxlan_id ne doit être écrit que pour le mode vxlan")
}
if got, _ := kv.GetFromDB(db, "subnet/sn-pub/local_iface"); got != "br-public" {
t.Errorf("local_iface %q, br-public attendu malgré iface_type vms", got)
}
}
func TestCreateSubnetCommand_Prepare_PublicIPFollowsInterfacesInternet(t *testing.T) {
cfg := testCfg()
cfg.Interfaces["internet"] = "br-pub2"
_, db := newTestDispatcher(t)
kv.AddInDB(db, "vpc/vpc-1/state", "running")
cmd := CreateSubnetCommand{Name: "sn-pub", VPC: "vpc-1", Mode: "public_ip", IfaceType: "vms", InterfaceIP: "203.0.113.254", CIDR: "203.0.113.0/24"}
if err := cmd.Prepare(db, cfg); err != nil {
t.Fatal(err)
}
if got, _ := kv.GetFromDB(db, "subnet/sn-pub/local_iface"); got != "br-pub2" {
t.Errorf("local_iface %q, br-pub2 attendu", got)
}
}
func TestCreateSubnetCommand_Prepare_RejectsUnknownMode(t *testing.T) {