From 74c50ec3ab3fe597c920969c7bcf2abd86d849dd Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Fri, 30 Oct 2026 01:01:20 +0100 Subject: [PATCH] =?UTF-8?q?f-89:=20watchdog:=20subnet=20public=5Fip=20cont?= =?UTF-8?q?r=C3=B4l=C3=A9=20comme=20bridge=20#89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: GnomeZworc --- internal/watchdog/check_subnet.go | 9 +++++---- internal/watchdog/check_subnet_test.go | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/internal/watchdog/check_subnet.go b/internal/watchdog/check_subnet.go index fa20c87..b3d4803 100644 --- a/internal/watchdog/check_subnet.go +++ b/internal/watchdog/check_subnet.go @@ -16,8 +16,9 @@ import ( ) const ( - modeVxlan = "vxlan" - modeBridge = "bridge" + modeVxlan = "vxlan" + modeBridge = "bridge" + modePublicIP = "public_ip" ) func subnetIfaceNames(subnetName string) (hostVeth, nsVeth, bridge string, err error) { @@ -83,7 +84,7 @@ func checkSubnet(db *badger.DB, name string, backend dhcpbackend.Backend, u unit n.Notify(kindSubnet, name, p+" (host)") } checkVxlanIface(db, name, n) - case modeBridge: + case modeBridge, modePublicIP: default: n.Notify(kindSubnet, name, fmt.Sprintf("unknown mode %q", mode)) } @@ -92,7 +93,7 @@ func checkSubnet(db *badger.DB, name string, backend dhcpbackend.Backend, u unit switch mode { case modeVxlan: checkAnycastGateway(db, name, vpc, bridge, n) - case modeBridge: + case modeBridge, modePublicIP: checkBridgeGateway(db, name, vpc, nsVeth, n) } diff --git a/internal/watchdog/check_subnet_test.go b/internal/watchdog/check_subnet_test.go index a94589c..70bc25a 100644 --- a/internal/watchdog/check_subnet_test.go +++ b/internal/watchdog/check_subnet_test.go @@ -132,6 +132,25 @@ func TestCheckSubnets_ModeBridgeNeVerifiePasDeVxlan(t *testing.T) { } } +func TestCheckSubnets_ModePublicIPEstConnuEtSansVxlan(t *testing.T) { + db := newTestDB(t) + seedSubnet(t, db, "pub-203a42", "vp-admin", modePublicIP) + r := &recorder{} + + if err := CheckSubnets(db, dnsmasqConfig(), newFakeUnits(), r); err != nil { + t.Fatalf("erreur inattendue: %v", err) + } + + for _, c := range r.calls { + if strings.Contains(c.problem, "unknown mode") || strings.Contains(c.problem, "vxlan") || strings.Contains(c.problem, "(host)") { + t.Errorf("un subnet public_ip est contrôlé comme bridge : %q", c.problem) + } + } + if !r.hasProblemContaining("vp-admin_br-203a42.conf") { + t.Errorf("témoin : le contrôle DHCP du subnet public_ip doit avoir lieu, obtenu %v", r.calls) + } +} + func TestCheckSubnets_ModeVxlanSansVxlanID(t *testing.T) { db := newTestDB(t) seedSubnet(t, db, "br-000042", "vp-admin", modeVxlan)