From cef465da2e5a32e801769e5a243b08fa9fedc386 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Mon, 18 May 2026 20:11:33 +0200 Subject: [PATCH 01/18] f-28: api: update api comportement and model Signed-off-by: GnomeZworc --- api/agent.yaml | 20 +++++++++++++++++--- internal/api/agent/models.go | 2 ++ 2 files changed, 19 insertions(+), 3 deletions(-) diff --git a/api/agent.yaml b/api/agent.yaml index 00d4fd8..95a0339 100644 --- a/api/agent.yaml +++ b/api/agent.yaml @@ -315,7 +315,7 @@ components: SubnetCreateRequest: type: object - required: [name, vpc, vxlan_id, gateway_ip, cidr] + required: [name, vpc, gateway_ip, cidr] properties: name: type: string @@ -325,9 +325,18 @@ components: type: string description: Parent VPC name example: vpc1 + mode: + type: string + description: > + Subnet mode. "vxlan" (default): creates a VXLAN tunnel and a host bridge. + "bridge": attaches directly to an existing bridge resolved from iface_type in the agent config. + "vlan" is reserved for future use. + enum: [vxlan, bridge] + default: vxlan + example: vxlan vxlan_id: type: integer - description: VXLAN VNI identifier + description: VXLAN VNI identifier. Required when mode is "vxlan", ignored otherwise. example: 100 iface_type: type: string @@ -356,12 +365,17 @@ components: vpc: type: string example: vpc1 + mode: + type: string + enum: [vxlan, bridge] + example: vxlan vxlan_id: type: integer + description: VXLAN VNI. Present only when mode is "vxlan". example: 100 local_iface: type: string - description: Resolved interface name + description: Resolved interface name from agent config example: br-000000 gateway_ip: type: string diff --git a/internal/api/agent/models.go b/internal/api/agent/models.go index f13407b..9622ef9 100644 --- a/internal/api/agent/models.go +++ b/internal/api/agent/models.go @@ -12,6 +12,7 @@ type VPC struct { type SubnetCreateRequest struct { Name string `json:"name"` VPC string `json:"vpc"` + Mode string `json:"mode"` VxlanID int `json:"vxlan_id"` IfaceType string `json:"iface_type"` GatewayIP string `json:"gateway_ip"` @@ -22,6 +23,7 @@ type Subnet struct { Name string `json:"name"` State string `json:"state"` VPC string `json:"vpc"` + Mode string `json:"mode"` VxlanID int `json:"vxlan_id"` LocalIface string `json:"local_iface"` GatewayIP string `json:"gateway_ip"` From 9a16cf011a2f3aa269deab7dc0df6318f5c707c8 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Mon, 18 May 2026 20:15:16 +0200 Subject: [PATCH 02/18] f-28: api: implement new model usage Signed-off-by: GnomeZworc --- internal/api/agent/subnet.go | 2 ++ internal/api/agent/subnets.go | 5 +++++ internal/dispatcher/agent/subnet_commands.go | 12 +++++++++++- 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/internal/api/agent/subnet.go b/internal/api/agent/subnet.go index 31eddc8..21bebf8 100644 --- a/internal/api/agent/subnet.go +++ b/internal/api/agent/subnet.go @@ -47,6 +47,8 @@ func (s *Server) getSubnet(w http.ResponseWriter, _ *http.Request, name string) sub.State = value case "vpc": sub.VPC = value + case "mode": + sub.Mode = value case "vxlan_id": sub.VxlanID, _ = strconv.Atoi(value) case "local_iface": diff --git a/internal/api/agent/subnets.go b/internal/api/agent/subnets.go index 60467aa..61082f1 100644 --- a/internal/api/agent/subnets.go +++ b/internal/api/agent/subnets.go @@ -44,6 +44,8 @@ func (s *Server) listSubnets(w http.ResponseWriter, _ *http.Request) { subnets[name].State = value case "vpc": subnets[name].VPC = value + case "mode": + subnets[name].Mode = value case "vxlan_id": subnets[name].VxlanID, _ = strconv.Atoi(value) case "local_iface": @@ -77,6 +79,7 @@ func (s *Server) postSubnet(w http.ResponseWriter, r *http.Request) { cmd := dispatcher.CreateSubnetCommand{ Name: req.Name, VPC: req.VPC, + Mode: req.Mode, VxlanID: req.VxlanID, IfaceType: req.IfaceType, GatewayIP: req.GatewayIP, @@ -109,6 +112,8 @@ func (s *Server) postSubnet(w http.ResponseWriter, r *http.Request) { sub.State = value case "vpc": sub.VPC = value + case "mode": + sub.Mode = value case "vxlan_id": sub.VxlanID, _ = strconv.Atoi(value) case "local_iface": diff --git a/internal/dispatcher/agent/subnet_commands.go b/internal/dispatcher/agent/subnet_commands.go index 18f2cd3..b454974 100644 --- a/internal/dispatcher/agent/subnet_commands.go +++ b/internal/dispatcher/agent/subnet_commands.go @@ -14,6 +14,7 @@ import ( type CreateSubnetCommand struct { Name string VPC string + Mode string VxlanID int IfaceType string GatewayIP string @@ -21,6 +22,12 @@ type CreateSubnetCommand struct { } func (c CreateSubnetCommand) Prepare(db *badger.DB, cfg *configuration.Config) error { + if c.Mode == "" { + c.Mode = "vxlan" + } + if c.Mode != "vxlan" && c.Mode != "bridge" { + return fmt.Errorf("unknown subnet mode %q", c.Mode) + } if _, err := kv.GetFromDB(db, "subnet/"+c.Name+"/state"); err == nil { return fmt.Errorf("subnet %q already exists", c.Name) } @@ -37,10 +44,13 @@ func (c CreateSubnetCommand) Prepare(db *badger.DB, cfg *configuration.Config) e } kv.AddInDB(db, "subnet/"+c.Name+"/state", "creating") kv.AddInDB(db, "subnet/"+c.Name+"/vpc", c.VPC) - kv.AddInDB(db, "subnet/"+c.Name+"/vxlan_id", strconv.Itoa(c.VxlanID)) + kv.AddInDB(db, "subnet/"+c.Name+"/mode", c.Mode) kv.AddInDB(db, "subnet/"+c.Name+"/local_iface", localIface) kv.AddInDB(db, "subnet/"+c.Name+"/gateway_ip", c.GatewayIP) kv.AddInDB(db, "subnet/"+c.Name+"/cidr", c.CIDR) + if c.Mode == "vxlan" { + kv.AddInDB(db, "subnet/"+c.Name+"/vxlan_id", strconv.Itoa(c.VxlanID)) + } return nil } From d457c73198427e3d83c7bb55eecc83bdda8b26f7 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Mon, 18 May 2026 20:45:39 +0200 Subject: [PATCH 03/18] f-28: bridge: first split bridge vxlan Signed-off-by: GnomeZworc --- internal/subnet/create.go | 137 +++++++++++++++++++++++++------------- internal/subnet/data.go | 21 ++++-- internal/subnet/delete.go | 52 ++++++++++++++- 3 files changed, 153 insertions(+), 57 deletions(-) diff --git a/internal/subnet/create.go b/internal/subnet/create.go index 5e80634..53349ca 100644 --- a/internal/subnet/create.go +++ b/internal/subnet/create.go @@ -27,46 +27,48 @@ func CreateSubnet(db *badger.DB, subnetName string) error { return err } - vxlanIface := fmt.Sprintf("vxlan-%d", d.vxlanID) + if err := createSubnet(db, subnetName, d); err != nil { + return err + } - if err := netif.CreateVethToNetns("v-"+d.subnetID+"-e", "v-"+d.subnetID+"-i", "/var/run/netns/"+d.vpc, 1500); err != nil { + return kv.AddInDB(db, "subnet/"+subnetName+"/state", "created") +} + +func createSubnet(db *badger.DB, subnetName string, d subnetData) error { + vethE := "v-" + d.subnetID + "-e" + vethI := "v-" + d.subnetID + "-i" + + if err := netif.CreateVethToNetns(vethE, vethI, "/var/run/netns/"+d.vpc, 1500); err != nil { return fmt.Errorf("create veth: %w", err) } - if err := netif.CreateBridge(d.bridge, 1500); err != nil { - return fmt.Errorf("create bridge: %w", err) - } - - if err := netns.Call(d.vpc, func() error { - return netif.CreateBridge(d.bridge, 1500) - }); err != nil { - return fmt.Errorf("create bridge in netns: %w", err) - } - - if err := netif.CreateVxlan(vxlanIface, d.vxlanID, d.localIface, 1500); err != nil { - return fmt.Errorf("create vxlan: %w", err) - } - - if err := netif.BridgeSetMaster("v-"+d.subnetID+"-e", d.bridge); err != nil { - return fmt.Errorf("add veth-e to bridge: %w", err) - } - if err := netns.Call(d.vpc, func() error { - return netif.BridgeSetMaster("v-"+d.subnetID+"-i", d.bridge) - }); err != nil { - return fmt.Errorf("add veth-i to bridge in netns: %w", err) - } - if err := netif.BridgeSetMaster(vxlanIface, d.bridge); err != nil { - return fmt.Errorf("add vxlan to bridge: %w", err) - } - - for _, iface := range []string{"v-" + d.subnetID + "-e", vxlanIface, d.bridge} { - if err := netif.LinkSetUp(iface); err != nil { - return fmt.Errorf("set up %s: %w", iface, err) + switch d.mode { + case "vxlan": + if err := setupVxlanHost(d, vethE); err != nil { + return err } + case "bridge": + if err := netif.BridgeSetMaster(vethE, d.localIface); err != nil { + return fmt.Errorf("add veth-e to bridge: %w", err) + } + if err := netif.LinkSetUp(vethE); err != nil { + return fmt.Errorf("set up %s: %w", vethE, err) + } + default: + return fmt.Errorf("unknown subnet mode %q", d.mode) } if err := netns.Call(d.vpc, func() error { - for _, iface := range []string{"v-" + d.subnetID + "-i", d.bridge} { + if err := netif.CreateBridge(d.bridge, 1500); err != nil { + return fmt.Errorf("create bridge: %w", err) + } + return netif.BridgeSetMaster(vethI, d.bridge) + }); err != nil { + return fmt.Errorf("setup bridge in netns: %w", err) + } + + if err := netns.Call(d.vpc, func() error { + for _, iface := range []string{vethI, d.bridge} { if err := netif.LinkSetUp(iface); err != nil { return fmt.Errorf("set up %s: %w", iface, err) } @@ -76,25 +78,65 @@ func CreateSubnet(db *badger.DB, subnetName string) error { return fmt.Errorf("set up interfaces in netns: %w", err) } - if err := netns.Call(d.vpc, func() error { - return netif.AddrAdd(d.bridge, d.gatewayIP) - }); err != nil { - return fmt.Errorf("add addr to bridge in netns: %w", err) + switch d.mode { + case "vxlan": + if err := netns.Call(d.vpc, func() error { + return netif.AddrAdd(d.bridge, d.gatewayIP) + }); err != nil { + return fmt.Errorf("add addr to bridge in netns: %w", err) + } + if err := netns.Call(d.vpc, func() error { + return netif.RouteAdd(d.bridge, d.cidr) + }); err != nil { + return fmt.Errorf("add route in netns: %w", err) + } + case "bridge": } - if err := netns.Call(d.vpc, func() error { - return netif.RouteAdd(d.bridge, d.cidr) - }); err != nil { - return fmt.Errorf("add route in netns: %w", err) + applyEbtables := func() error { + if err := ebtables.DropARPToGateway(d.bridge, d.gatewayIP.String()); err != nil { + return err + } + return ebtables.DropDHCP(d.bridge) + } + switch d.mode { + case "vxlan": + if err := applyEbtables(); err != nil { + return err + } + case "bridge": + if err := netns.Call(d.vpc, applyEbtables); err != nil { + return fmt.Errorf("set ebtables in netns: %w", err) + } } - if err := ebtables.DropARPToGateway(d.bridge, d.gatewayIP.String()); err != nil { - return err - } - if err := ebtables.DropDHCP(d.bridge); err != nil { - return err - } + return startDHCP(db, subnetName, d) +} +func setupVxlanHost(d subnetData, vethE string) error { + vxlanIface := fmt.Sprintf("vxlan-%d", d.vxlanID) + + if err := netif.CreateBridge(d.bridge, 1500); err != nil { + return fmt.Errorf("create bridge: %w", err) + } + if err := netif.CreateVxlan(vxlanIface, d.vxlanID, d.localIface, 1500); err != nil { + return fmt.Errorf("create vxlan: %w", err) + } + if err := netif.BridgeSetMaster(vethE, d.bridge); err != nil { + return fmt.Errorf("add veth-e to bridge: %w", err) + } + if err := netif.BridgeSetMaster(vxlanIface, d.bridge); err != nil { + return fmt.Errorf("add vxlan to bridge: %w", err) + } + for _, iface := range []string{vethE, vxlanIface, d.bridge} { + if err := netif.LinkSetUp(iface); err != nil { + return fmt.Errorf("set up %s: %w", iface, err) + } + } + return nil +} + +func startDHCP(db *badger.DB, subnetName string, d subnetData) error { conf := dhcp.Config{ Network: d.cidr, Gateway: d.gatewayIP, @@ -118,6 +160,5 @@ func CreateSubnet(db *badger.DB, subnetName string) error { if err := svc.Start("dnsmasq@" + conf.Name + ".service"); err != nil { return fmt.Errorf("start dnsmasq: %w", err) } - - return kv.AddInDB(db, "subnet/"+subnetName+"/state", "created") + return nil } diff --git a/internal/subnet/data.go b/internal/subnet/data.go index 31f5472..2936e21 100644 --- a/internal/subnet/data.go +++ b/internal/subnet/data.go @@ -14,6 +14,7 @@ type subnetData struct { vpc string subnetID string bridge string + mode string vxlanID int localIface string gatewayIP net.IP @@ -32,15 +33,23 @@ func loadSubnet(db *badger.DB, name string) (subnetData, error) { } d.vpc = vpc - vxlanIDStr, err := kv.GetFromDB(db, "subnet/"+name+"/vxlan_id") + mode, err := kv.GetFromDB(db, "subnet/"+name+"/mode") if err != nil { - return d, fmt.Errorf("get vxlan_id: %w", err) + return d, fmt.Errorf("get mode: %w", err) } - vxlanID, err := strconv.Atoi(vxlanIDStr) - if err != nil { - return d, fmt.Errorf("parse vxlan_id: %w", err) + d.mode = mode + + if d.mode == "vxlan" { + vxlanIDStr, err := kv.GetFromDB(db, "subnet/"+name+"/vxlan_id") + if err != nil { + return d, fmt.Errorf("get vxlan_id: %w", err) + } + vxlanID, err := strconv.Atoi(vxlanIDStr) + if err != nil { + return d, fmt.Errorf("parse vxlan_id: %w", err) + } + d.vxlanID = vxlanID } - d.vxlanID = vxlanID localIface, err := kv.GetFromDB(db, "subnet/"+name+"/local_iface") if err != nil { diff --git a/internal/subnet/delete.go b/internal/subnet/delete.go index e7e3929..bc62af7 100644 --- a/internal/subnet/delete.go +++ b/internal/subnet/delete.go @@ -27,8 +27,27 @@ func DeleteSubnet(db *badger.DB, subnetName string) error { return err } - vxlanIface := fmt.Sprintf("vxlan-%d", d.vxlanID) + if err := stopDHCP(db, subnetName, d); err != nil { + return err + } + switch d.mode { + case "vxlan": + if err := deleteSubnetVxlan(d); err != nil { + return err + } + case "bridge": + if err := deleteSubnetBridge(d); err != nil { + return err + } + default: + return fmt.Errorf("unknown subnet mode %q", d.mode) + } + + return kv.AddInDB(db, "subnet/"+subnetName+"/state", "deleted") +} + +func stopDHCP(db *badger.DB, subnetName string, d subnetData) error { svc, err := systemd.New() if err != nil { return fmt.Errorf("connect to systemd: %w", err) @@ -42,9 +61,15 @@ func DeleteSubnet(db *badger.DB, subnetName string) error { if err := os.Remove("/etc/dnsmasq.d/" + d.vpc + "_" + d.bridge + ".conf"); err != nil && !os.IsNotExist(err) { return fmt.Errorf("remove dnsmasq config: %w", err) } + if err := kv.DeleteInDB(db, "subnet/"+subnetName+"/dhcp"); err != nil { return fmt.Errorf("delete dhcp entries: %w", err) } + return nil +} + +func deleteSubnetVxlan(d subnetData) error { + vxlanIface := fmt.Sprintf("vxlan-%d", d.vxlanID) if err := ebtables.DeleteARPToGateway(d.bridge, d.gatewayIP.String()); err != nil { return fmt.Errorf("delete ebtables arp rule: %w", err) @@ -70,6 +95,27 @@ func DeleteSubnet(db *badger.DB, subnetName string) error { if err := netif.DeleteLink(d.bridge); err != nil { return fmt.Errorf("delete bridge: %w", err) } - - return kv.AddInDB(db, "subnet/"+subnetName+"/state", "deleted") + return nil +} + +func deleteSubnetBridge(d subnetData) error { + if err := netns.Call(d.vpc, func() error { + if err := ebtables.DeleteARPToGateway(d.bridge, d.gatewayIP.String()); err != nil { + return fmt.Errorf("delete ebtables arp rule: %w", err) + } + return ebtables.DeleteDHCP(d.bridge) + }); err != nil { + return fmt.Errorf("delete ebtables in netns: %w", err) + } + + if err := netns.Call(d.vpc, func() error { + return netif.DeleteLink(d.bridge) + }); err != nil { + return fmt.Errorf("delete bridge in netns: %w", err) + } + + if err := netif.DeleteLink("v-" + d.subnetID + "-e"); err != nil { + return fmt.Errorf("delete veth: %w", err) + } + return nil } From 91a5d7ac786b3639f37c86b2cc0ed50d3874ab54 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Mon, 18 May 2026 21:11:09 +0200 Subject: [PATCH 04/18] f-28: bridge: fix ebtables Signed-off-by: GnomeZworc --- internal/subnet/create.go | 12 +++--------- internal/subnet/delete.go | 9 --------- 2 files changed, 3 insertions(+), 18 deletions(-) diff --git a/internal/subnet/create.go b/internal/subnet/create.go index 53349ca..3fbd31b 100644 --- a/internal/subnet/create.go +++ b/internal/subnet/create.go @@ -93,21 +93,15 @@ func createSubnet(db *badger.DB, subnetName string, d subnetData) error { case "bridge": } - applyEbtables := func() error { + switch d.mode { + case "vxlan": if err := ebtables.DropARPToGateway(d.bridge, d.gatewayIP.String()); err != nil { return err } - return ebtables.DropDHCP(d.bridge) - } - switch d.mode { - case "vxlan": - if err := applyEbtables(); err != nil { + if err := ebtables.DropDHCP(d.bridge); err != nil { return err } case "bridge": - if err := netns.Call(d.vpc, applyEbtables); err != nil { - return fmt.Errorf("set ebtables in netns: %w", err) - } } return startDHCP(db, subnetName, d) diff --git a/internal/subnet/delete.go b/internal/subnet/delete.go index bc62af7..51fac1a 100644 --- a/internal/subnet/delete.go +++ b/internal/subnet/delete.go @@ -99,15 +99,6 @@ func deleteSubnetVxlan(d subnetData) error { } func deleteSubnetBridge(d subnetData) error { - if err := netns.Call(d.vpc, func() error { - if err := ebtables.DeleteARPToGateway(d.bridge, d.gatewayIP.String()); err != nil { - return fmt.Errorf("delete ebtables arp rule: %w", err) - } - return ebtables.DeleteDHCP(d.bridge) - }); err != nil { - return fmt.Errorf("delete ebtables in netns: %w", err) - } - if err := netns.Call(d.vpc, func() error { return netif.DeleteLink(d.bridge) }); err != nil { From 9492de7a2bdd585d0444c43e58fc46b070d6394a Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Mon, 18 May 2026 21:50:29 +0200 Subject: [PATCH 05/18] f-28: test: add tests Signed-off-by: GnomeZworc --- internal/api/agent/subnet_test.go | 45 ++++++++++++++ .../dispatcher/agent/subnet_commands_test.go | 62 +++++++++++++++++++ 2 files changed, 107 insertions(+) diff --git a/internal/api/agent/subnet_test.go b/internal/api/agent/subnet_test.go index 23745a0..ca6ec2c 100644 --- a/internal/api/agent/subnet_test.go +++ b/internal/api/agent/subnet_test.go @@ -161,6 +161,51 @@ func TestPostSubnet_VPCDeleting(t *testing.T) { } } +func TestPostSubnet_BridgeMode_Success(t *testing.T) { + s, db := newTestServer(t) + kv.AddInDB(db, "vpc/vpc-1/state", "created") + req := SubnetCreateRequest{ + Name: "sn-br", + VPC: "vpc-1", + Mode: "bridge", + IfaceType: "vms", + GatewayIP: "10.0.0.1", + CIDR: "10.0.0.0/24", + } + body, _ := json.Marshal(req) + w := httptest.NewRecorder() + s.SubnetsHandler(w, httptest.NewRequest(http.MethodPost, "/subnets", bytes.NewReader(body))) + if w.Code != http.StatusAccepted { + t.Fatalf("attendu 202, obtenu %d: %s", w.Code, w.Body.String()) + } + var result Subnet + json.NewDecoder(w.Body).Decode(&result) + if result.Mode != "bridge" { + t.Errorf("mode attendu bridge, obtenu %q", result.Mode) + } + if result.VxlanID != 0 { + t.Errorf("vxlan_id devrait être 0 en mode bridge, obtenu %d", result.VxlanID) + } +} + +func TestPostSubnet_UnknownMode(t *testing.T) { + s, db := newTestServer(t) + kv.AddInDB(db, "vpc/vpc-1/state", "created") + req := SubnetCreateRequest{ + Name: "sn-1", + VPC: "vpc-1", + Mode: "vlan", + GatewayIP: "10.0.0.1", + CIDR: "10.0.0.0/24", + } + body, _ := json.Marshal(req) + w := httptest.NewRecorder() + s.SubnetsHandler(w, httptest.NewRequest(http.MethodPost, "/subnets", bytes.NewReader(body))) + if w.Code != http.StatusUnprocessableEntity { + t.Errorf("attendu 422, obtenu %d", w.Code) + } +} + func TestPostSubnet_InvalidBody(t *testing.T) { s, _ := newTestServer(t) w := httptest.NewRecorder() diff --git a/internal/dispatcher/agent/subnet_commands_test.go b/internal/dispatcher/agent/subnet_commands_test.go index 3b118bc..b0fba3d 100644 --- a/internal/dispatcher/agent/subnet_commands_test.go +++ b/internal/dispatcher/agent/subnet_commands_test.go @@ -111,6 +111,68 @@ func TestCreateSubnetCommand_Prepare_VPCDeleted(t *testing.T) { } } +func TestCreateSubnetCommand_Prepare_DefaultsToVxlanMode(t *testing.T) { + _, db := newTestDispatcher(t) + kv.AddInDB(db, "vpc/vpc-1/state", "created") + cmd := CreateSubnetCommand{ + Name: "sn-1", VPC: "vpc-1", VxlanID: 100, + IfaceType: "vms", GatewayIP: "10.0.0.1", CIDR: "10.0.0.0/24", + } + cmd.Prepare(db, testCfg()) + mode, _ := kv.GetFromDB(db, "subnet/sn-1/mode") + if mode != "vxlan" { + t.Errorf("mode attendu vxlan, obtenu %q", mode) + } + if _, err := kv.GetFromDB(db, "subnet/sn-1/vxlan_id"); err != nil { + t.Error("vxlan_id devrait être écrit en mode vxlan") + } +} + +func TestCreateSubnetCommand_Prepare_BridgeMode_Success(t *testing.T) { + _, db := newTestDispatcher(t) + kv.AddInDB(db, "vpc/vpc-1/state", "created") + cmd := CreateSubnetCommand{ + Name: "sn-1", VPC: "vpc-1", Mode: "bridge", + IfaceType: "vms", GatewayIP: "10.0.0.1", CIDR: "10.0.0.0/24", + } + if err := cmd.Prepare(db, testCfg()); err != nil { + t.Fatalf("Prepare a échoué : %v", err) + } + mode, _ := kv.GetFromDB(db, "subnet/sn-1/mode") + if mode != "bridge" { + t.Errorf("mode attendu bridge, obtenu %q", mode) + } + iface, _ := kv.GetFromDB(db, "subnet/sn-1/local_iface") + if iface != "br-vms" { + t.Errorf("local_iface attendu br-vms, obtenu %q", iface) + } +} + +func TestCreateSubnetCommand_Prepare_BridgeMode_NoVxlanID(t *testing.T) { + _, db := newTestDispatcher(t) + kv.AddInDB(db, "vpc/vpc-1/state", "created") + cmd := CreateSubnetCommand{ + Name: "sn-1", VPC: "vpc-1", Mode: "bridge", + IfaceType: "vms", GatewayIP: "10.0.0.1", CIDR: "10.0.0.0/24", + } + cmd.Prepare(db, testCfg()) + if _, err := kv.GetFromDB(db, "subnet/sn-1/vxlan_id"); err == nil { + t.Error("vxlan_id ne devrait pas être écrit en mode bridge") + } +} + +func TestCreateSubnetCommand_Prepare_UnknownMode(t *testing.T) { + _, db := newTestDispatcher(t) + kv.AddInDB(db, "vpc/vpc-1/state", "created") + cmd := CreateSubnetCommand{ + Name: "sn-1", VPC: "vpc-1", Mode: "vlan", + IfaceType: "vms", GatewayIP: "10.0.0.1", CIDR: "10.0.0.0/24", + } + if err := cmd.Prepare(db, testCfg()); err == nil { + t.Error("Prepare devrait échouer pour un mode inconnu") + } +} + // --- DeleteSubnetCommand.Prepare --- func TestDeleteSubnetCommand_Prepare_Success(t *testing.T) { From 848f965883f46ab533e54653d1a098990e5613cf Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Mon, 18 May 2026 21:58:33 +0200 Subject: [PATCH 06/18] f-28: fix: renomage api param Signed-off-by: GnomeZworc --- api/agent.yaml | 6 ++--- internal/api/agent/models.go | 4 ++-- internal/api/agent/subnet.go | 4 ++-- internal/api/agent/subnet_test.go | 16 +++++++------- internal/api/agent/subnets.go | 14 ++++++------ internal/dispatcher/agent/subnet_commands.go | 4 ++-- .../dispatcher/agent/subnet_commands_test.go | 22 +++++++++---------- internal/subnet/create.go | 6 ++--- internal/subnet/data.go | 14 ++++++------ internal/subnet/delete.go | 2 +- internal/vm/create.go | 4 ++-- internal/vm/data.go | 8 +++---- internal/vm/delete.go | 2 +- 13 files changed, 53 insertions(+), 53 deletions(-) diff --git a/api/agent.yaml b/api/agent.yaml index 95a0339..44a5c80 100644 --- a/api/agent.yaml +++ b/api/agent.yaml @@ -315,7 +315,7 @@ components: SubnetCreateRequest: type: object - required: [name, vpc, gateway_ip, cidr] + required: [name, vpc, interface_ip, cidr] properties: name: type: string @@ -342,7 +342,7 @@ components: type: string description: Interface type key defined in the agent config (e.g. vms, internet, admin). Falls back to default_interface if omitted or unknown. example: vms - gateway_ip: + interface_ip: type: string format: ipv4 description: Gateway IP for the subnet @@ -377,7 +377,7 @@ components: type: string description: Resolved interface name from agent config example: br-000000 - gateway_ip: + interface_ip: type: string example: "10.10.10.1" cidr: diff --git a/internal/api/agent/models.go b/internal/api/agent/models.go index 9622ef9..4621f1c 100644 --- a/internal/api/agent/models.go +++ b/internal/api/agent/models.go @@ -15,7 +15,7 @@ type SubnetCreateRequest struct { Mode string `json:"mode"` VxlanID int `json:"vxlan_id"` IfaceType string `json:"iface_type"` - GatewayIP string `json:"gateway_ip"` + InterfaceIP string `json:"interface_ip"` CIDR string `json:"cidr"` } @@ -26,7 +26,7 @@ type Subnet struct { Mode string `json:"mode"` VxlanID int `json:"vxlan_id"` LocalIface string `json:"local_iface"` - GatewayIP string `json:"gateway_ip"` + InterfaceIP string `json:"interface_ip"` CIDR string `json:"cidr"` } diff --git a/internal/api/agent/subnet.go b/internal/api/agent/subnet.go index 21bebf8..95b0199 100644 --- a/internal/api/agent/subnet.go +++ b/internal/api/agent/subnet.go @@ -53,8 +53,8 @@ func (s *Server) getSubnet(w http.ResponseWriter, _ *http.Request, name string) sub.VxlanID, _ = strconv.Atoi(value) case "local_iface": sub.LocalIface = value - case "gateway_ip": - sub.GatewayIP = value + case "interface_ip": + sub.InterfaceIP = value case "cidr": sub.CIDR = value } diff --git a/internal/api/agent/subnet_test.go b/internal/api/agent/subnet_test.go index ca6ec2c..36e42f7 100644 --- a/internal/api/agent/subnet_test.go +++ b/internal/api/agent/subnet_test.go @@ -60,7 +60,7 @@ func TestPostSubnet_Created(t *testing.T) { Name: "sn-new", VPC: "vpc-1", IfaceType: "vms", - GatewayIP: "10.0.0.1", + InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", } body, _ := json.Marshal(req) @@ -95,7 +95,7 @@ func TestPostSubnet_IfaceTypeOptional(t *testing.T) { req := SubnetCreateRequest{ Name: "sn-opt", VPC: "vpc-1", - GatewayIP: "10.0.0.1", + InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", // IfaceType omis — doit utiliser default_interface } @@ -113,7 +113,7 @@ func TestPostSubnet_VPCNotFound(t *testing.T) { Name: "sn-1", VPC: "vpc-inexistant", IfaceType: "vms", - GatewayIP: "10.0.0.1", + InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", } body, _ := json.Marshal(req) @@ -132,7 +132,7 @@ func TestPostSubnet_Duplicate(t *testing.T) { Name: "sn-exist", VPC: "vpc-1", IfaceType: "vms", - GatewayIP: "10.0.0.1", + InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", } body, _ := json.Marshal(req) @@ -150,7 +150,7 @@ func TestPostSubnet_VPCDeleting(t *testing.T) { Name: "sn-1", VPC: "vpc-dying", IfaceType: "vms", - GatewayIP: "10.0.0.1", + InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", } body, _ := json.Marshal(req) @@ -169,7 +169,7 @@ func TestPostSubnet_BridgeMode_Success(t *testing.T) { VPC: "vpc-1", Mode: "bridge", IfaceType: "vms", - GatewayIP: "10.0.0.1", + InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", } body, _ := json.Marshal(req) @@ -195,7 +195,7 @@ func TestPostSubnet_UnknownMode(t *testing.T) { Name: "sn-1", VPC: "vpc-1", Mode: "vlan", - GatewayIP: "10.0.0.1", + InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", } body, _ := json.Marshal(req) @@ -222,7 +222,7 @@ func TestGetSubnet_Found(t *testing.T) { kv.AddInDB(db, "subnet/sn-1/state", "created") kv.AddInDB(db, "subnet/sn-1/vpc", "vpc-1") kv.AddInDB(db, "subnet/sn-1/cidr", "10.0.0.0/24") - kv.AddInDB(db, "subnet/sn-1/gateway_ip", "10.0.0.1") + kv.AddInDB(db, "subnet/sn-1/interface_ip", "10.0.0.1") req := httptest.NewRequest(http.MethodGet, "/subnets/sn-1", nil) w := httptest.NewRecorder() s.SubnetByNameHandler(w, req) diff --git a/internal/api/agent/subnets.go b/internal/api/agent/subnets.go index 61082f1..a70e618 100644 --- a/internal/api/agent/subnets.go +++ b/internal/api/agent/subnets.go @@ -50,8 +50,8 @@ func (s *Server) listSubnets(w http.ResponseWriter, _ *http.Request) { subnets[name].VxlanID, _ = strconv.Atoi(value) case "local_iface": subnets[name].LocalIface = value - case "gateway_ip": - subnets[name].GatewayIP = value + case "interface_ip": + subnets[name].InterfaceIP = value case "cidr": subnets[name].CIDR = value } @@ -71,9 +71,9 @@ func (s *Server) postSubnet(w http.ResponseWriter, r *http.Request) { json.NewEncoder(w).Encode(ErrorResponse{Error: "invalid request body"}) return } - if req.Name == "" || req.VPC == "" || req.GatewayIP == "" || req.CIDR == "" { + if req.Name == "" || req.VPC == "" || req.InterfaceIP == "" || req.CIDR == "" { w.WriteHeader(http.StatusBadRequest) - json.NewEncoder(w).Encode(ErrorResponse{Error: "name, vpc, gateway_ip and cidr are required"}) + json.NewEncoder(w).Encode(ErrorResponse{Error: "name, vpc, interface_ip and cidr are required"}) return } cmd := dispatcher.CreateSubnetCommand{ @@ -82,7 +82,7 @@ func (s *Server) postSubnet(w http.ResponseWriter, r *http.Request) { Mode: req.Mode, VxlanID: req.VxlanID, IfaceType: req.IfaceType, - GatewayIP: req.GatewayIP, + InterfaceIP: req.InterfaceIP, CIDR: req.CIDR, } if err := s.dispatcher.Prepare(cmd); err != nil { @@ -118,8 +118,8 @@ func (s *Server) postSubnet(w http.ResponseWriter, r *http.Request) { sub.VxlanID, _ = strconv.Atoi(value) case "local_iface": sub.LocalIface = value - case "gateway_ip": - sub.GatewayIP = value + case "interface_ip": + sub.InterfaceIP = value case "cidr": sub.CIDR = value } diff --git a/internal/dispatcher/agent/subnet_commands.go b/internal/dispatcher/agent/subnet_commands.go index b454974..db07c6c 100644 --- a/internal/dispatcher/agent/subnet_commands.go +++ b/internal/dispatcher/agent/subnet_commands.go @@ -17,7 +17,7 @@ type CreateSubnetCommand struct { Mode string VxlanID int IfaceType string - GatewayIP string + InterfaceIP string CIDR string } @@ -46,7 +46,7 @@ func (c CreateSubnetCommand) Prepare(db *badger.DB, cfg *configuration.Config) e kv.AddInDB(db, "subnet/"+c.Name+"/vpc", c.VPC) kv.AddInDB(db, "subnet/"+c.Name+"/mode", c.Mode) kv.AddInDB(db, "subnet/"+c.Name+"/local_iface", localIface) - kv.AddInDB(db, "subnet/"+c.Name+"/gateway_ip", c.GatewayIP) + kv.AddInDB(db, "subnet/"+c.Name+"/interface_ip", c.InterfaceIP) kv.AddInDB(db, "subnet/"+c.Name+"/cidr", c.CIDR) if c.Mode == "vxlan" { kv.AddInDB(db, "subnet/"+c.Name+"/vxlan_id", strconv.Itoa(c.VxlanID)) diff --git a/internal/dispatcher/agent/subnet_commands_test.go b/internal/dispatcher/agent/subnet_commands_test.go index b0fba3d..94f2d4c 100644 --- a/internal/dispatcher/agent/subnet_commands_test.go +++ b/internal/dispatcher/agent/subnet_commands_test.go @@ -20,7 +20,7 @@ func TestCreateSubnetCommand_Prepare_Success(t *testing.T) { kv.AddInDB(db, "vpc/vpc-1/state", "created") cmd := CreateSubnetCommand{ Name: "sn-1", VPC: "vpc-1", VxlanID: 100, - IfaceType: "vms", GatewayIP: "10.0.0.1", CIDR: "10.0.0.0/24", + IfaceType: "vms", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", } if err := cmd.Prepare(db, testCfg()); err != nil { t.Fatalf("Prepare a échoué : %v", err) @@ -40,7 +40,7 @@ func TestCreateSubnetCommand_Prepare_UsesIfaceTypeMapping(t *testing.T) { kv.AddInDB(db, "vpc/vpc-1/state", "created") cmd := CreateSubnetCommand{ Name: "sn-1", VPC: "vpc-1", VxlanID: 100, - IfaceType: "vms", GatewayIP: "10.0.0.1", CIDR: "10.0.0.0/24", + IfaceType: "vms", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", } cmd.Prepare(db, testCfg()) iface, _ := kv.GetFromDB(db, "subnet/sn-1/local_iface") @@ -54,7 +54,7 @@ func TestCreateSubnetCommand_Prepare_UsesDefaultIfaceWhenTypeUnknown(t *testing. kv.AddInDB(db, "vpc/vpc-1/state", "created") cmd := CreateSubnetCommand{ Name: "sn-1", VPC: "vpc-1", VxlanID: 100, - IfaceType: "inconnu", GatewayIP: "10.0.0.1", CIDR: "10.0.0.0/24", + IfaceType: "inconnu", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", } cmd.Prepare(db, testCfg()) iface, _ := kv.GetFromDB(db, "subnet/sn-1/local_iface") @@ -69,7 +69,7 @@ func TestCreateSubnetCommand_Prepare_Duplicate(t *testing.T) { kv.AddInDB(db, "subnet/sn-exist/state", "created") cmd := CreateSubnetCommand{ Name: "sn-exist", VPC: "vpc-1", VxlanID: 100, - IfaceType: "vms", GatewayIP: "10.0.0.1", CIDR: "10.0.0.0/24", + IfaceType: "vms", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", } if err := cmd.Prepare(db, testCfg()); err == nil { t.Error("Prepare devrait échouer sur un subnet déjà existant") @@ -80,7 +80,7 @@ func TestCreateSubnetCommand_Prepare_VPCNotFound(t *testing.T) { _, db := newTestDispatcher(t) cmd := CreateSubnetCommand{ Name: "sn-1", VPC: "vpc-inexistant", VxlanID: 100, - IfaceType: "vms", GatewayIP: "10.0.0.1", CIDR: "10.0.0.0/24", + IfaceType: "vms", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", } if err := cmd.Prepare(db, testCfg()); err == nil { t.Error("Prepare devrait échouer si le VPC n'existe pas") @@ -92,7 +92,7 @@ func TestCreateSubnetCommand_Prepare_VPCDeleting(t *testing.T) { kv.AddInDB(db, "vpc/vpc-dying/state", "deleting") cmd := CreateSubnetCommand{ Name: "sn-1", VPC: "vpc-dying", VxlanID: 100, - IfaceType: "vms", GatewayIP: "10.0.0.1", CIDR: "10.0.0.0/24", + IfaceType: "vms", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", } if err := cmd.Prepare(db, testCfg()); err == nil { t.Error("Prepare devrait échouer si le VPC est en cours de suppression") @@ -104,7 +104,7 @@ func TestCreateSubnetCommand_Prepare_VPCDeleted(t *testing.T) { kv.AddInDB(db, "vpc/vpc-gone/state", "deleted") cmd := CreateSubnetCommand{ Name: "sn-1", VPC: "vpc-gone", VxlanID: 100, - IfaceType: "vms", GatewayIP: "10.0.0.1", CIDR: "10.0.0.0/24", + IfaceType: "vms", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", } if err := cmd.Prepare(db, testCfg()); err == nil { t.Error("Prepare devrait échouer si le VPC est supprimé") @@ -116,7 +116,7 @@ func TestCreateSubnetCommand_Prepare_DefaultsToVxlanMode(t *testing.T) { kv.AddInDB(db, "vpc/vpc-1/state", "created") cmd := CreateSubnetCommand{ Name: "sn-1", VPC: "vpc-1", VxlanID: 100, - IfaceType: "vms", GatewayIP: "10.0.0.1", CIDR: "10.0.0.0/24", + IfaceType: "vms", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", } cmd.Prepare(db, testCfg()) mode, _ := kv.GetFromDB(db, "subnet/sn-1/mode") @@ -133,7 +133,7 @@ func TestCreateSubnetCommand_Prepare_BridgeMode_Success(t *testing.T) { kv.AddInDB(db, "vpc/vpc-1/state", "created") cmd := CreateSubnetCommand{ Name: "sn-1", VPC: "vpc-1", Mode: "bridge", - IfaceType: "vms", GatewayIP: "10.0.0.1", CIDR: "10.0.0.0/24", + IfaceType: "vms", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", } if err := cmd.Prepare(db, testCfg()); err != nil { t.Fatalf("Prepare a échoué : %v", err) @@ -153,7 +153,7 @@ func TestCreateSubnetCommand_Prepare_BridgeMode_NoVxlanID(t *testing.T) { kv.AddInDB(db, "vpc/vpc-1/state", "created") cmd := CreateSubnetCommand{ Name: "sn-1", VPC: "vpc-1", Mode: "bridge", - IfaceType: "vms", GatewayIP: "10.0.0.1", CIDR: "10.0.0.0/24", + IfaceType: "vms", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", } cmd.Prepare(db, testCfg()) if _, err := kv.GetFromDB(db, "subnet/sn-1/vxlan_id"); err == nil { @@ -166,7 +166,7 @@ func TestCreateSubnetCommand_Prepare_UnknownMode(t *testing.T) { kv.AddInDB(db, "vpc/vpc-1/state", "created") cmd := CreateSubnetCommand{ Name: "sn-1", VPC: "vpc-1", Mode: "vlan", - IfaceType: "vms", GatewayIP: "10.0.0.1", CIDR: "10.0.0.0/24", + IfaceType: "vms", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", } if err := cmd.Prepare(db, testCfg()); err == nil { t.Error("Prepare devrait échouer pour un mode inconnu") diff --git a/internal/subnet/create.go b/internal/subnet/create.go index 3fbd31b..e660814 100644 --- a/internal/subnet/create.go +++ b/internal/subnet/create.go @@ -81,7 +81,7 @@ func createSubnet(db *badger.DB, subnetName string, d subnetData) error { switch d.mode { case "vxlan": if err := netns.Call(d.vpc, func() error { - return netif.AddrAdd(d.bridge, d.gatewayIP) + return netif.AddrAdd(d.bridge, d.interfaceIP) }); err != nil { return fmt.Errorf("add addr to bridge in netns: %w", err) } @@ -95,7 +95,7 @@ func createSubnet(db *badger.DB, subnetName string, d subnetData) error { switch d.mode { case "vxlan": - if err := ebtables.DropARPToGateway(d.bridge, d.gatewayIP.String()); err != nil { + if err := ebtables.DropARPToGateway(d.bridge, d.interfaceIP.String()); err != nil { return err } if err := ebtables.DropDHCP(d.bridge); err != nil { @@ -133,7 +133,7 @@ func setupVxlanHost(d subnetData, vethE string) error { func startDHCP(db *badger.DB, subnetName string, d subnetData) error { conf := dhcp.Config{ Network: d.cidr, - Gateway: d.gatewayIP, + Gateway: d.interfaceIP, Name: d.vpc + "_" + d.bridge, ConfDir: "/etc/dnsmasq.d", } diff --git a/internal/subnet/data.go b/internal/subnet/data.go index 2936e21..849b141 100644 --- a/internal/subnet/data.go +++ b/internal/subnet/data.go @@ -17,7 +17,7 @@ type subnetData struct { mode string vxlanID int localIface string - gatewayIP net.IP + interfaceIP net.IP cidr *net.IPNet } @@ -57,15 +57,15 @@ func loadSubnet(db *badger.DB, name string) (subnetData, error) { } d.localIface = localIface - gatewayIPStr, err := kv.GetFromDB(db, "subnet/"+name+"/gateway_ip") + interfaceIPStr, err := kv.GetFromDB(db, "subnet/"+name+"/interface_ip") if err != nil { - return d, fmt.Errorf("get gateway_ip: %w", err) + return d, fmt.Errorf("get interface_ip: %w", err) } - gatewayIP := net.ParseIP(gatewayIPStr) - if gatewayIP == nil { - return d, fmt.Errorf("invalid gateway_ip: %s", gatewayIPStr) + interfaceIP := net.ParseIP(interfaceIPStr) + if interfaceIP == nil { + return d, fmt.Errorf("invalid interface_ip: %s", interfaceIPStr) } - d.gatewayIP = gatewayIP + d.interfaceIP = interfaceIP cidrStr, err := kv.GetFromDB(db, "subnet/"+name+"/cidr") if err != nil { diff --git a/internal/subnet/delete.go b/internal/subnet/delete.go index 51fac1a..abe2fdf 100644 --- a/internal/subnet/delete.go +++ b/internal/subnet/delete.go @@ -71,7 +71,7 @@ func stopDHCP(db *badger.DB, subnetName string, d subnetData) error { func deleteSubnetVxlan(d subnetData) error { vxlanIface := fmt.Sprintf("vxlan-%d", d.vxlanID) - if err := ebtables.DeleteARPToGateway(d.bridge, d.gatewayIP.String()); err != nil { + if err := ebtables.DeleteARPToGateway(d.bridge, d.interfaceIP.String()); err != nil { return fmt.Errorf("delete ebtables arp rule: %w", err) } if err := ebtables.DeleteDHCP(d.bridge); err != nil { diff --git a/internal/vm/create.go b/internal/vm/create.go index 53e2e96..f3e9d34 100644 --- a/internal/vm/create.go +++ b/internal/vm/create.go @@ -33,7 +33,7 @@ func StartVM(db *badger.DB, name string, cfg *configuration.Config) error { } if err := netns.Call(d.vpcName, func() error { - return iptables.AddMetadataRedirect(d.ip, d.gatewayIP, d.metadataPort) + return iptables.AddMetadataRedirect(d.ip, d.interfaceIP, d.metadataPort) }); err != nil { return fmt.Errorf("add metadata redirect: %w", err) } @@ -41,7 +41,7 @@ func StartVM(db *badger.DB, name string, cfg *configuration.Config) error { if err := metadata.StartMetadata(metadata.NoCloudConfig{ Name: name, VpcName: d.vpcName, - BindIP: d.gatewayIP, + BindIP: d.interfaceIP, BindPort: d.metadataPort, Password: d.password, SSHKEY: d.sshkey, diff --git a/internal/vm/data.go b/internal/vm/data.go index 0563fc0..df5c051 100644 --- a/internal/vm/data.go +++ b/internal/vm/data.go @@ -14,7 +14,7 @@ import ( type vmData struct { subnetName string vpcName string - gatewayIP string + interfaceIP string bridge string tapID int ip string @@ -43,11 +43,11 @@ func loadVM(db *badger.DB, name string) (vmData, error) { } d.vpcName = vpcName - gatewayIP, err := kv.GetFromDB(db, "subnet/"+subnetName+"/gateway_ip") + interfaceIP, err := kv.GetFromDB(db, "subnet/"+subnetName+"/interface_ip") if err != nil { - return d, fmt.Errorf("get gateway_ip: %w", err) + return d, fmt.Errorf("get interface_ip: %w", err) } - d.gatewayIP = gatewayIP + d.interfaceIP = interfaceIP tapIDStr, err := kv.GetFromDB(db, "vm/"+name+"/tap_id") if err != nil { diff --git a/internal/vm/delete.go b/internal/vm/delete.go index 5030339..79a4c72 100644 --- a/internal/vm/delete.go +++ b/internal/vm/delete.go @@ -52,7 +52,7 @@ func StopVM(db *badger.DB, name string, cfg *configuration.Config) error { } if err := netns.Call(d.vpcName, func() error { - return iptables.DeleteMetadataRedirect(d.ip, d.gatewayIP, d.metadataPort) + return iptables.DeleteMetadataRedirect(d.ip, d.interfaceIP, d.metadataPort) }); err != nil { return fmt.Errorf("delete metadata redirect: %w", err) } From 32b78a84f98b034ee731c6cd3b35cfcab90d4cbe Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Mon, 18 May 2026 22:14:21 +0200 Subject: [PATCH 07/18] f-28: fix: add proper dhcp handle Signed-off-by: GnomeZworc --- internal/ebtables/ebtables.go | 22 +++++++++++---------- internal/subnet/create.go | 36 +++++++++++++++++++---------------- internal/subnet/delete.go | 23 +++++++++++++--------- 3 files changed, 46 insertions(+), 35 deletions(-) diff --git a/internal/ebtables/ebtables.go b/internal/ebtables/ebtables.go index 31e276b..40ea0f0 100644 --- a/internal/ebtables/ebtables.go +++ b/internal/ebtables/ebtables.go @@ -13,46 +13,48 @@ func deleteRule(args ...string) error { return exec.Command("ebtables", append([]string{"-D"}, args...)...).Run() } -func DropARPToGateway(bridge, gatewayIP string) error { +func DropARPToGateway(iface, ip string) error { if err := addRule("FORWARD", - "--out-interface", bridge, + "--out-interface", iface, "-p", "arp", "--arp-op", "Request", - "--arp-ip-dst", gatewayIP, + "--arp-ip-dst", ip, "-j", "DROP"); err != nil { return fmt.Errorf("ebtables arp rule: %w", err) } return nil } -func DropDHCP(bridge string) error { +func DropDHCP(iface, ip string) error { if err := addRule("FORWARD", - "--out-interface", bridge, + "--out-interface", iface, "-p", "IPv4", "--ip-protocol", "udp", "--ip-source-port", "67:68", "--ip-destination-port", "67:68", + "--ip-source", ip, "-j", "DROP"); err != nil { return fmt.Errorf("ebtables dhcp rule: %w", err) } return nil } -func DeleteARPToGateway(bridge, gatewayIP string) error { +func DeleteARPToGateway(iface, ip string) error { return deleteRule("FORWARD", - "--out-interface", bridge, + "--out-interface", iface, "-p", "arp", "--arp-op", "Request", - "--arp-ip-dst", gatewayIP, + "--arp-ip-dst", ip, "-j", "DROP") } -func DeleteDHCP(bridge string) error { +func DeleteDHCP(iface, ip string) error { return deleteRule("FORWARD", - "--out-interface", bridge, + "--out-interface", iface, "-p", "IPv4", "--ip-protocol", "udp", "--ip-source-port", "67:68", "--ip-destination-port", "67:68", + "--ip-source", ip, "-j", "DROP") } diff --git a/internal/subnet/create.go b/internal/subnet/create.go index e660814..f161d98 100644 --- a/internal/subnet/create.go +++ b/internal/subnet/create.go @@ -81,27 +81,31 @@ func createSubnet(db *badger.DB, subnetName string, d subnetData) error { switch d.mode { case "vxlan": if err := netns.Call(d.vpc, func() error { - return netif.AddrAdd(d.bridge, d.interfaceIP) + if err := netif.AddrAdd(d.bridge, d.interfaceIP); err != nil { + return fmt.Errorf("add addr: %w", err) + } + if err := netif.RouteAdd(d.bridge, d.cidr); err != nil { + return fmt.Errorf("add route: %w", err) + } + if err := ebtables.DropARPToGateway(vethI, d.interfaceIP.String()); err != nil { + return err + } + return ebtables.DropDHCP(vethI, d.interfaceIP.String()) }); err != nil { - return fmt.Errorf("add addr to bridge in netns: %w", err) + return fmt.Errorf("configure netns: %w", err) } + case "bridge": if err := netns.Call(d.vpc, func() error { - return netif.RouteAdd(d.bridge, d.cidr) + if err := netif.AddrAdd(d.bridge, d.interfaceIP); err != nil { + return fmt.Errorf("add addr: %w", err) + } + if err := netif.RouteAdd(d.bridge, d.cidr); err != nil { + return fmt.Errorf("add route: %w", err) + } + return ebtables.DropDHCP(vethI, d.interfaceIP.String()) }); err != nil { - return fmt.Errorf("add route in netns: %w", err) + return fmt.Errorf("configure netns: %w", err) } - case "bridge": - } - - switch d.mode { - case "vxlan": - if err := ebtables.DropARPToGateway(d.bridge, d.interfaceIP.String()); err != nil { - return err - } - if err := ebtables.DropDHCP(d.bridge); err != nil { - return err - } - case "bridge": } return startDHCP(db, subnetName, d) diff --git a/internal/subnet/delete.go b/internal/subnet/delete.go index abe2fdf..0ae30b5 100644 --- a/internal/subnet/delete.go +++ b/internal/subnet/delete.go @@ -70,18 +70,18 @@ func stopDHCP(db *badger.DB, subnetName string, d subnetData) error { func deleteSubnetVxlan(d subnetData) error { vxlanIface := fmt.Sprintf("vxlan-%d", d.vxlanID) - - if err := ebtables.DeleteARPToGateway(d.bridge, d.interfaceIP.String()); err != nil { - return fmt.Errorf("delete ebtables arp rule: %w", err) - } - if err := ebtables.DeleteDHCP(d.bridge); err != nil { - return fmt.Errorf("delete ebtables dhcp rule: %w", err) - } + vethI := "v-" + d.subnetID + "-i" if err := netns.Call(d.vpc, func() error { + if err := ebtables.DeleteARPToGateway(vethI, d.interfaceIP.String()); err != nil { + return fmt.Errorf("delete ebtables arp rule: %w", err) + } + if err := ebtables.DeleteDHCP(vethI, d.interfaceIP.String()); err != nil { + return fmt.Errorf("delete ebtables dhcp rule: %w", err) + } return netif.DeleteLink(d.bridge) }); err != nil { - return fmt.Errorf("delete bridge in netns: %w", err) + return fmt.Errorf("delete netns resources: %w", err) } if err := netif.DeleteLink(vxlanIface); err != nil { @@ -99,10 +99,15 @@ func deleteSubnetVxlan(d subnetData) error { } func deleteSubnetBridge(d subnetData) error { + vethI := "v-" + d.subnetID + "-i" + if err := netns.Call(d.vpc, func() error { + if err := ebtables.DeleteDHCP(vethI, d.interfaceIP.String()); err != nil { + return fmt.Errorf("delete ebtables dhcp rule: %w", err) + } return netif.DeleteLink(d.bridge) }); err != nil { - return fmt.Errorf("delete bridge in netns: %w", err) + return fmt.Errorf("delete netns resources: %w", err) } if err := netif.DeleteLink("v-" + d.subnetID + "-e"); err != nil { From 2504b435a33de818532b8761915111a1656ad493 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Mon, 18 May 2026 22:19:00 +0200 Subject: [PATCH 08/18] f-28: fix: dhcp do not emit local default route Signed-off-by: GnomeZworc --- internal/dhcp/dhcp_test.go | 20 ++++++++++++++++---- internal/dhcp/generate.go | 4 +++- internal/dhcp/struct.go | 9 +++++---- internal/subnet/create.go | 9 +++++---- 4 files changed, 29 insertions(+), 13 deletions(-) diff --git a/internal/dhcp/dhcp_test.go b/internal/dhcp/dhcp_test.go index 1681fec..94f1b78 100644 --- a/internal/dhcp/dhcp_test.go +++ b/internal/dhcp/dhcp_test.go @@ -52,10 +52,11 @@ func newConf(t *testing.T, cidr string) Config { t.Helper() _, network, _ := net.ParseCIDR(cidr) return Config{ - Network: network, - Gateway: net.ParseIP("192.168.1.1").To4(), - Name: "test", - ConfDir: t.TempDir(), + Network: network, + Gateway: net.ParseIP("192.168.1.1").To4(), + DefaultRoute: true, + Name: "test", + ConfDir: t.TempDir(), } } @@ -94,6 +95,17 @@ func TestGenerateConfig_ContainsGateway(t *testing.T) { } } +func TestGenerateConfig_NoDefaultRoute(t *testing.T) { + conf := newConf(t, "192.168.1.0/29") + conf.DefaultRoute = false + path, _, _ := GenerateConfig(conf) + content, _ := os.ReadFile(path) + + if strings.Contains(string(content), "dhcp-option=3,") { + t.Errorf("dhcp-option=3 présente alors que DefaultRoute=false :\n%s", content) + } +} + func TestGenerateConfig_ContainsDhcpRange(t *testing.T) { _, network, _ := net.ParseCIDR("10.10.0.0/24") conf := Config{ diff --git a/internal/dhcp/generate.go b/internal/dhcp/generate.go index 3c46fe2..90608f3 100644 --- a/internal/dhcp/generate.go +++ b/internal/dhcp/generate.go @@ -14,7 +14,9 @@ func GenerateConfig(c Config) (string, map[string]string, error) { var sb strings.Builder fmt.Fprintf(&sb, "no-resolv\n") fmt.Fprintf(&sb, "dhcp-range=%s,static,%s,12h\n", c.Network.IP.String(), mask) - fmt.Fprintf(&sb, "dhcp-option=3,%s\n", c.Gateway.String()) + if c.DefaultRoute { + fmt.Fprintf(&sb, "dhcp-option=3,%s\n", c.Gateway.String()) + } fmt.Fprintf(&sb, "dhcp-option=6,1.1.1.1,8.8.8.8\n\n") entries := make(map[string]string) diff --git a/internal/dhcp/struct.go b/internal/dhcp/struct.go index 4c69b9c..d73e052 100644 --- a/internal/dhcp/struct.go +++ b/internal/dhcp/struct.go @@ -5,8 +5,9 @@ import ( ) type Config struct { - Network *net.IPNet - Gateway net.IP - Name string - ConfDir string + Network *net.IPNet + Gateway net.IP + DefaultRoute bool + Name string + ConfDir string } diff --git a/internal/subnet/create.go b/internal/subnet/create.go index f161d98..8607328 100644 --- a/internal/subnet/create.go +++ b/internal/subnet/create.go @@ -136,10 +136,11 @@ func setupVxlanHost(d subnetData, vethE string) error { func startDHCP(db *badger.DB, subnetName string, d subnetData) error { conf := dhcp.Config{ - Network: d.cidr, - Gateway: d.interfaceIP, - Name: d.vpc + "_" + d.bridge, - ConfDir: "/etc/dnsmasq.d", + Network: d.cidr, + Gateway: d.interfaceIP, + DefaultRoute: d.mode == "vxlan", + Name: d.vpc + "_" + d.bridge, + ConfDir: "/etc/dnsmasq.d", } _, entries, err := dhcp.GenerateConfig(conf) if err != nil { From 76a840b80ad44ff3f5cb048d5cdea229630a1d70 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Mon, 18 May 2026 22:47:28 +0200 Subject: [PATCH 09/18] f-28: add vpc cidr field Signed-off-by: GnomeZworc --- api/agent.yaml | 9 +++++- internal/api/agent/models.go | 2 ++ internal/api/agent/vpc.go | 3 +- internal/api/agent/vpc_test.go | 29 +++++++++++++++++-- internal/api/agent/vpcs.go | 20 +++++++++++-- internal/dispatcher/agent/vpc_commands.go | 8 +++++ .../dispatcher/agent/vpc_commands_test.go | 19 ++++++++++-- internal/subnet/data.go | 25 +++++++++++----- 8 files changed, 98 insertions(+), 17 deletions(-) diff --git a/api/agent.yaml b/api/agent.yaml index 44a5c80..e3bf8b9 100644 --- a/api/agent.yaml +++ b/api/agent.yaml @@ -294,13 +294,17 @@ components: VPCCreateRequest: type: object - required: [name] + required: [name, cidr] properties: name: type: string description: Unique name for the VPC, must follow the format vp-[id] pattern: '^vp-.+' example: vp-00001 + cidr: + type: string + description: CIDR block for the entire VPC address space + example: "10.0.0.0/16" VPC: type: object @@ -312,6 +316,9 @@ components: type: string enum: [creating, created, deleting, deleted] example: created + cidr: + type: string + example: "10.0.0.0/16" SubnetCreateRequest: type: object diff --git a/internal/api/agent/models.go b/internal/api/agent/models.go index 4621f1c..ffa994a 100644 --- a/internal/api/agent/models.go +++ b/internal/api/agent/models.go @@ -2,11 +2,13 @@ package agentapi type VPCCreateRequest struct { Name string `json:"name"` + CIDR string `json:"cidr"` } type VPC struct { Name string `json:"name"` State string `json:"state"` + CIDR string `json:"cidr"` } type SubnetCreateRequest struct { diff --git a/internal/api/agent/vpc.go b/internal/api/agent/vpc.go index 43cc33c..bb3f5d7 100644 --- a/internal/api/agent/vpc.go +++ b/internal/api/agent/vpc.go @@ -35,8 +35,9 @@ func (s *Server) getVpc(w http.ResponseWriter, _ *http.Request, name string) { json.NewEncoder(w).Encode(ErrorResponse{Error: "vpc not found"}) return } + cidr, _ := kv.GetFromDB(s.db, "vpc/"+name+"/cidr") w.WriteHeader(http.StatusOK) - json.NewEncoder(w).Encode(VPC{Name: name, State: state}) + json.NewEncoder(w).Encode(VPC{Name: name, State: state, CIDR: cidr}) } func (s *Server) deleteVpc(w http.ResponseWriter, _ *http.Request, name string) { diff --git a/internal/api/agent/vpc_test.go b/internal/api/agent/vpc_test.go index 01308a5..3516305 100644 --- a/internal/api/agent/vpc_test.go +++ b/internal/api/agent/vpc_test.go @@ -53,7 +53,7 @@ func TestListVpcs_InvalidMethod(t *testing.T) { func TestPostVpc_Created(t *testing.T) { s, _ := newTestServer(t) - body, _ := json.Marshal(VPCCreateRequest{Name: "vpc-new"}) + body, _ := json.Marshal(VPCCreateRequest{Name: "vpc-new", CIDR: "10.0.0.0/16"}) w := httptest.NewRecorder() s.VpcsHandler(w, httptest.NewRequest(http.MethodPost, "/vpcs", bytes.NewReader(body))) if w.Code != http.StatusAccepted { @@ -67,11 +67,34 @@ func TestPostVpc_Created(t *testing.T) { if result.State != "creating" { t.Errorf("state attendu creating, obtenu %q", result.State) } + if result.CIDR != "10.0.0.0/16" { + t.Errorf("cidr attendu 10.0.0.0/16, obtenu %q", result.CIDR) + } } func TestPostVpc_MissingName(t *testing.T) { s, _ := newTestServer(t) - body, _ := json.Marshal(VPCCreateRequest{}) + body, _ := json.Marshal(VPCCreateRequest{CIDR: "10.0.0.0/16"}) + w := httptest.NewRecorder() + s.VpcsHandler(w, httptest.NewRequest(http.MethodPost, "/vpcs", bytes.NewReader(body))) + if w.Code != http.StatusBadRequest { + t.Errorf("attendu 400, obtenu %d", w.Code) + } +} + +func TestPostVpc_MissingCIDR(t *testing.T) { + s, _ := newTestServer(t) + body, _ := json.Marshal(VPCCreateRequest{Name: "vpc-new"}) + w := httptest.NewRecorder() + s.VpcsHandler(w, httptest.NewRequest(http.MethodPost, "/vpcs", bytes.NewReader(body))) + if w.Code != http.StatusBadRequest { + t.Errorf("attendu 400, obtenu %d", w.Code) + } +} + +func TestPostVpc_InvalidCIDR(t *testing.T) { + s, _ := newTestServer(t) + body, _ := json.Marshal(VPCCreateRequest{Name: "vpc-new", CIDR: "not-a-cidr"}) w := httptest.NewRecorder() s.VpcsHandler(w, httptest.NewRequest(http.MethodPost, "/vpcs", bytes.NewReader(body))) if w.Code != http.StatusBadRequest { @@ -82,7 +105,7 @@ func TestPostVpc_MissingName(t *testing.T) { func TestPostVpc_Duplicate(t *testing.T) { s, db := newTestServer(t) kv.AddInDB(db, "vpc/vpc-exist/state", "created") - body, _ := json.Marshal(VPCCreateRequest{Name: "vpc-exist"}) + body, _ := json.Marshal(VPCCreateRequest{Name: "vpc-exist", CIDR: "10.0.0.0/16"}) w := httptest.NewRecorder() s.VpcsHandler(w, httptest.NewRequest(http.MethodPost, "/vpcs", bytes.NewReader(body))) if w.Code != http.StatusConflict { diff --git a/internal/api/agent/vpcs.go b/internal/api/agent/vpcs.go index b062d1c..905cdee 100644 --- a/internal/api/agent/vpcs.go +++ b/internal/api/agent/vpcs.go @@ -2,6 +2,7 @@ package agentapi import ( "encoding/json" + "net" "net/http" "strings" @@ -38,8 +39,11 @@ func (s *Server) listVpcs(w http.ResponseWriter, _ *http.Request) { if _, ok := vpcs[name]; !ok { vpcs[name] = &VPC{Name: name} } - if parts[2] == "state" { + switch parts[2] { + case "state": vpcs[name].State = value + case "cidr": + vpcs[name].CIDR = value } } result := make([]VPC, 0, len(vpcs)) @@ -62,7 +66,17 @@ func (s *Server) postVpc(w http.ResponseWriter, r *http.Request) { json.NewEncoder(w).Encode(ErrorResponse{Error: "name is required"}) return } - cmd := dispatcher.CreateVPCCommand{Name: req.Name} + if req.CIDR == "" { + w.WriteHeader(http.StatusBadRequest) + json.NewEncoder(w).Encode(ErrorResponse{Error: "cidr is required"}) + return + } + if _, _, err := net.ParseCIDR(req.CIDR); err != nil { + w.WriteHeader(http.StatusBadRequest) + json.NewEncoder(w).Encode(ErrorResponse{Error: "invalid cidr"}) + return + } + cmd := dispatcher.CreateVPCCommand{Name: req.Name, CIDR: req.CIDR} if err := s.dispatcher.Prepare(cmd); err != nil { w.WriteHeader(http.StatusConflict) json.NewEncoder(w).Encode(ErrorResponse{Error: err.Error()}) @@ -76,5 +90,5 @@ func (s *Server) postVpc(w http.ResponseWriter, r *http.Request) { return } w.WriteHeader(http.StatusAccepted) - json.NewEncoder(w).Encode(VPC{Name: req.Name, State: state}) + json.NewEncoder(w).Encode(VPC{Name: req.Name, State: state, CIDR: req.CIDR}) } diff --git a/internal/dispatcher/agent/vpc_commands.go b/internal/dispatcher/agent/vpc_commands.go index c03dd77..a129d88 100644 --- a/internal/dispatcher/agent/vpc_commands.go +++ b/internal/dispatcher/agent/vpc_commands.go @@ -2,6 +2,7 @@ package dispatcher import ( "fmt" + "net" "strings" "time" @@ -13,12 +14,19 @@ import ( type CreateVPCCommand struct { Name string + CIDR string } func (c CreateVPCCommand) Prepare(db *badger.DB, _ *configuration.Config) error { if _, err := kv.GetFromDB(db, "vpc/"+c.Name+"/state"); err == nil { return fmt.Errorf("vpc %q already exists", c.Name) } + if _, _, err := net.ParseCIDR(c.CIDR); err != nil { + return fmt.Errorf("invalid cidr %q: %w", c.CIDR, err) + } + if err := kv.AddInDB(db, "vpc/"+c.Name+"/cidr", c.CIDR); err != nil { + return err + } return kv.AddInDB(db, "vpc/"+c.Name+"/state", "creating") } diff --git a/internal/dispatcher/agent/vpc_commands_test.go b/internal/dispatcher/agent/vpc_commands_test.go index e2f2162..9633733 100644 --- a/internal/dispatcher/agent/vpc_commands_test.go +++ b/internal/dispatcher/agent/vpc_commands_test.go @@ -10,7 +10,7 @@ import ( func TestCreateVPCCommand_Prepare_NewVPC(t *testing.T) { _, db := newTestDispatcher(t) - cmd := CreateVPCCommand{Name: "vpc-1"} + cmd := CreateVPCCommand{Name: "vpc-1", CIDR: "10.0.0.0/16"} if err := cmd.Prepare(db, nil); err != nil { t.Fatalf("Prepare a échoué : %v", err) } @@ -21,17 +21,32 @@ func TestCreateVPCCommand_Prepare_NewVPC(t *testing.T) { if state != "creating" { t.Errorf("state attendu creating, obtenu %q", state) } + cidr, err := kv.GetFromDB(db, "vpc/vpc-1/cidr") + if err != nil { + t.Fatalf("cidr non écrit en DB : %v", err) + } + if cidr != "10.0.0.0/16" { + t.Errorf("cidr attendu 10.0.0.0/16, obtenu %q", cidr) + } } func TestCreateVPCCommand_Prepare_Duplicate(t *testing.T) { _, db := newTestDispatcher(t) kv.AddInDB(db, "vpc/vpc-exist/state", "created") - cmd := CreateVPCCommand{Name: "vpc-exist"} + cmd := CreateVPCCommand{Name: "vpc-exist", CIDR: "10.0.0.0/16"} if err := cmd.Prepare(db, nil); err == nil { t.Error("Prepare devrait échouer sur un VPC déjà existant") } } +func TestCreateVPCCommand_Prepare_InvalidCIDR(t *testing.T) { + _, db := newTestDispatcher(t) + cmd := CreateVPCCommand{Name: "vpc-bad", CIDR: "not-a-cidr"} + if err := cmd.Prepare(db, nil); err == nil { + t.Error("Prepare devrait échouer avec un CIDR invalide") + } +} + // --- DeleteVPCCommand.Prepare --- func TestDeleteVPCCommand_Prepare_Success(t *testing.T) { diff --git a/internal/subnet/data.go b/internal/subnet/data.go index 849b141..fbc45ff 100644 --- a/internal/subnet/data.go +++ b/internal/subnet/data.go @@ -11,14 +11,15 @@ import ( ) type subnetData struct { - vpc string - subnetID string - bridge string - mode string - vxlanID int - localIface string + vpc string + subnetID string + bridge string + mode string + vxlanID int + localIface string interfaceIP net.IP - cidr *net.IPNet + cidr *net.IPNet + vpcCIDR *net.IPNet } func loadSubnet(db *badger.DB, name string) (subnetData, error) { @@ -77,5 +78,15 @@ func loadSubnet(db *badger.DB, name string) (subnetData, error) { } d.cidr = ipNet + vpcCIDRStr, err := kv.GetFromDB(db, "vpc/"+d.vpc+"/cidr") + if err != nil { + return d, fmt.Errorf("get vpc cidr: %w", err) + } + _, vpcIPNet, err := net.ParseCIDR(vpcCIDRStr) + if err != nil { + return d, fmt.Errorf("parse vpc cidr: %w", err) + } + d.vpcCIDR = vpcIPNet + return d, nil } From bb5698fddae2333e017192bd9516e165ea025b21 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Mon, 18 May 2026 22:49:01 +0200 Subject: [PATCH 10/18] f-28: add subnet default_route field Signed-off-by: GnomeZworc --- api/agent.yaml | 9 +++++ internal/api/agent/models.go | 32 +++++++++-------- internal/api/agent/subnet.go | 2 ++ internal/api/agent/subnets.go | 19 +++++++---- internal/dispatcher/agent/subnet_commands.go | 16 +++++---- .../dispatcher/agent/subnet_commands_test.go | 34 +++++++++++++++++++ internal/subnet/data.go | 25 +++++++++----- 7 files changed, 99 insertions(+), 38 deletions(-) diff --git a/api/agent.yaml b/api/agent.yaml index e3bf8b9..1476859 100644 --- a/api/agent.yaml +++ b/api/agent.yaml @@ -358,6 +358,12 @@ components: type: string description: Subnet CIDR block example: "10.10.10.0/24" + default_route: + type: boolean + description: > + If true, advertise a default route via DHCP. For vxlan mode the gateway is the interface IP. + For bridge mode the gateway is read from the host routing table. + default: false Subnet: type: object @@ -390,6 +396,9 @@ components: cidr: type: string example: "10.10.10.0/24" + default_route: + type: boolean + example: false VMCreateRequest: type: object diff --git a/internal/api/agent/models.go b/internal/api/agent/models.go index ffa994a..6535c4c 100644 --- a/internal/api/agent/models.go +++ b/internal/api/agent/models.go @@ -12,24 +12,26 @@ type VPC struct { } type SubnetCreateRequest struct { - Name string `json:"name"` - VPC string `json:"vpc"` - Mode string `json:"mode"` - VxlanID int `json:"vxlan_id"` - IfaceType string `json:"iface_type"` - InterfaceIP string `json:"interface_ip"` - CIDR string `json:"cidr"` + Name string `json:"name"` + VPC string `json:"vpc"` + Mode string `json:"mode"` + VxlanID int `json:"vxlan_id"` + IfaceType string `json:"iface_type"` + InterfaceIP string `json:"interface_ip"` + CIDR string `json:"cidr"` + DefaultRoute bool `json:"default_route"` } type Subnet struct { - Name string `json:"name"` - State string `json:"state"` - VPC string `json:"vpc"` - Mode string `json:"mode"` - VxlanID int `json:"vxlan_id"` - LocalIface string `json:"local_iface"` - InterfaceIP string `json:"interface_ip"` - CIDR string `json:"cidr"` + Name string `json:"name"` + State string `json:"state"` + VPC string `json:"vpc"` + Mode string `json:"mode"` + VxlanID int `json:"vxlan_id"` + LocalIface string `json:"local_iface"` + InterfaceIP string `json:"interface_ip"` + CIDR string `json:"cidr"` + DefaultRoute bool `json:"default_route"` } type VMInterface struct { diff --git a/internal/api/agent/subnet.go b/internal/api/agent/subnet.go index 95b0199..36ee9d7 100644 --- a/internal/api/agent/subnet.go +++ b/internal/api/agent/subnet.go @@ -57,6 +57,8 @@ func (s *Server) getSubnet(w http.ResponseWriter, _ *http.Request, name string) sub.InterfaceIP = value case "cidr": sub.CIDR = value + case "default_route": + sub.DefaultRoute = value == "true" } } w.WriteHeader(http.StatusOK) diff --git a/internal/api/agent/subnets.go b/internal/api/agent/subnets.go index a70e618..3cea247 100644 --- a/internal/api/agent/subnets.go +++ b/internal/api/agent/subnets.go @@ -54,6 +54,8 @@ func (s *Server) listSubnets(w http.ResponseWriter, _ *http.Request) { subnets[name].InterfaceIP = value case "cidr": subnets[name].CIDR = value + case "default_route": + subnets[name].DefaultRoute = value == "true" } } result := make([]Subnet, 0, len(subnets)) @@ -77,13 +79,14 @@ func (s *Server) postSubnet(w http.ResponseWriter, r *http.Request) { return } cmd := dispatcher.CreateSubnetCommand{ - Name: req.Name, - VPC: req.VPC, - Mode: req.Mode, - VxlanID: req.VxlanID, - IfaceType: req.IfaceType, - InterfaceIP: req.InterfaceIP, - CIDR: req.CIDR, + Name: req.Name, + VPC: req.VPC, + Mode: req.Mode, + VxlanID: req.VxlanID, + IfaceType: req.IfaceType, + InterfaceIP: req.InterfaceIP, + CIDR: req.CIDR, + DefaultRoute: req.DefaultRoute, } if err := s.dispatcher.Prepare(cmd); err != nil { if _, dbErr := kv.GetFromDB(s.db, "subnet/"+req.Name+"/state"); dbErr == nil { @@ -122,6 +125,8 @@ func (s *Server) postSubnet(w http.ResponseWriter, r *http.Request) { sub.InterfaceIP = value case "cidr": sub.CIDR = value + case "default_route": + sub.DefaultRoute = value == "true" } } w.WriteHeader(http.StatusAccepted) diff --git a/internal/dispatcher/agent/subnet_commands.go b/internal/dispatcher/agent/subnet_commands.go index db07c6c..e488842 100644 --- a/internal/dispatcher/agent/subnet_commands.go +++ b/internal/dispatcher/agent/subnet_commands.go @@ -12,13 +12,14 @@ import ( ) type CreateSubnetCommand struct { - Name string - VPC string - Mode string - VxlanID int - IfaceType string - InterfaceIP string - CIDR string + Name string + VPC string + Mode string + VxlanID int + IfaceType string + InterfaceIP string + CIDR string + DefaultRoute bool } func (c CreateSubnetCommand) Prepare(db *badger.DB, cfg *configuration.Config) error { @@ -48,6 +49,7 @@ func (c CreateSubnetCommand) Prepare(db *badger.DB, cfg *configuration.Config) e kv.AddInDB(db, "subnet/"+c.Name+"/local_iface", localIface) kv.AddInDB(db, "subnet/"+c.Name+"/interface_ip", c.InterfaceIP) kv.AddInDB(db, "subnet/"+c.Name+"/cidr", c.CIDR) + kv.AddInDB(db, "subnet/"+c.Name+"/default_route", strconv.FormatBool(c.DefaultRoute)) if c.Mode == "vxlan" { kv.AddInDB(db, "subnet/"+c.Name+"/vxlan_id", strconv.Itoa(c.VxlanID)) } diff --git a/internal/dispatcher/agent/subnet_commands_test.go b/internal/dispatcher/agent/subnet_commands_test.go index 94f2d4c..b6aacee 100644 --- a/internal/dispatcher/agent/subnet_commands_test.go +++ b/internal/dispatcher/agent/subnet_commands_test.go @@ -173,6 +173,40 @@ func TestCreateSubnetCommand_Prepare_UnknownMode(t *testing.T) { } } +func TestCreateSubnetCommand_Prepare_DefaultRouteStored(t *testing.T) { + _, db := newTestDispatcher(t) + kv.AddInDB(db, "vpc/vpc-1/state", "created") + cmd := CreateSubnetCommand{ + Name: "sn-1", VPC: "vpc-1", VxlanID: 100, + IfaceType: "vms", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", + DefaultRoute: true, + } + if err := cmd.Prepare(db, testCfg()); err != nil { + t.Fatalf("Prepare a échoué : %v", err) + } + val, err := kv.GetFromDB(db, "subnet/sn-1/default_route") + if err != nil { + t.Fatalf("default_route non écrit en DB : %v", err) + } + if val != "true" { + t.Errorf("default_route attendu true, obtenu %q", val) + } +} + +func TestCreateSubnetCommand_Prepare_DefaultRouteFalseByDefault(t *testing.T) { + _, db := newTestDispatcher(t) + kv.AddInDB(db, "vpc/vpc-1/state", "created") + cmd := CreateSubnetCommand{ + Name: "sn-1", VPC: "vpc-1", VxlanID: 100, + IfaceType: "vms", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", + } + cmd.Prepare(db, testCfg()) + val, _ := kv.GetFromDB(db, "subnet/sn-1/default_route") + if val != "false" { + t.Errorf("default_route attendu false, obtenu %q", val) + } +} + // --- DeleteSubnetCommand.Prepare --- func TestDeleteSubnetCommand_Prepare_Success(t *testing.T) { diff --git a/internal/subnet/data.go b/internal/subnet/data.go index fbc45ff..0f1f62a 100644 --- a/internal/subnet/data.go +++ b/internal/subnet/data.go @@ -11,15 +11,16 @@ import ( ) type subnetData struct { - vpc string - subnetID string - bridge string - mode string - vxlanID int - localIface string - interfaceIP net.IP - cidr *net.IPNet - vpcCIDR *net.IPNet + vpc string + subnetID string + bridge string + mode string + vxlanID int + localIface string + interfaceIP net.IP + cidr *net.IPNet + vpcCIDR *net.IPNet + defaultRoute bool } func loadSubnet(db *badger.DB, name string) (subnetData, error) { @@ -78,6 +79,12 @@ func loadSubnet(db *badger.DB, name string) (subnetData, error) { } d.cidr = ipNet + defaultRouteStr, err := kv.GetFromDB(db, "subnet/"+name+"/default_route") + if err != nil { + return d, fmt.Errorf("get default_route: %w", err) + } + d.defaultRoute = defaultRouteStr == "true" + vpcCIDRStr, err := kv.GetFromDB(db, "vpc/"+d.vpc+"/cidr") if err != nil { return d, fmt.Errorf("get vpc cidr: %w", err) From c0caf1a24cb9022d6259e0f4f42c332d9ad787b7 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Mon, 18 May 2026 22:49:21 +0200 Subject: [PATCH 11/18] f-28: add GetDefaultGateway to netif Signed-off-by: GnomeZworc --- internal/netif/gateway_linux.go | 23 +++++++++++++++++++++++ internal/netif/gateway_other.go | 12 ++++++++++++ 2 files changed, 35 insertions(+) create mode 100644 internal/netif/gateway_linux.go create mode 100644 internal/netif/gateway_other.go diff --git a/internal/netif/gateway_linux.go b/internal/netif/gateway_linux.go new file mode 100644 index 0000000..7636b7a --- /dev/null +++ b/internal/netif/gateway_linux.go @@ -0,0 +1,23 @@ +//go:build linux + +package netif + +import ( + "fmt" + "net" + + "github.com/vishvananda/netlink" +) + +func GetDefaultGateway() (net.IP, error) { + routes, err := netlink.RouteList(nil, netlink.FAMILY_V4) + if err != nil { + return nil, fmt.Errorf("list routes: %w", err) + } + for _, r := range routes { + if r.Dst == nil && r.Gw != nil { + return r.Gw, nil + } + } + return nil, fmt.Errorf("no default gateway found") +} diff --git a/internal/netif/gateway_other.go b/internal/netif/gateway_other.go new file mode 100644 index 0000000..764867c --- /dev/null +++ b/internal/netif/gateway_other.go @@ -0,0 +1,12 @@ +//go:build !linux + +package netif + +import ( + "fmt" + "net" +) + +func GetDefaultGateway() (net.IP, error) { + return nil, fmt.Errorf("not supported on this platform") +} From 1b56a42627351e80d9f7de3f68e4383d0af115b3 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Mon, 18 May 2026 22:50:39 +0200 Subject: [PATCH 12/18] f-28: refactor dhcp config to use VPCRoute and DefaultGateway Signed-off-by: GnomeZworc --- internal/dhcp/dhcp_test.go | 46 ++++++++++++++++++++++++++++---------- internal/dhcp/generate.go | 7 ++++-- internal/dhcp/struct.go | 11 ++++----- internal/subnet/create.go | 21 ++++++++++++----- 4 files changed, 61 insertions(+), 24 deletions(-) diff --git a/internal/dhcp/dhcp_test.go b/internal/dhcp/dhcp_test.go index 94f1b78..a2d5e60 100644 --- a/internal/dhcp/dhcp_test.go +++ b/internal/dhcp/dhcp_test.go @@ -51,12 +51,15 @@ func TestIncrementIP_Carry(t *testing.T) { func newConf(t *testing.T, cidr string) Config { t.Helper() _, network, _ := net.ParseCIDR(cidr) + _, vpcNet, _ := net.ParseCIDR("10.0.0.0/16") + gw := net.ParseIP("192.168.1.1").To4() return Config{ - Network: network, - Gateway: net.ParseIP("192.168.1.1").To4(), - DefaultRoute: true, - Name: "test", - ConfDir: t.TempDir(), + Network: network, + VPCGateway: gw, + VPCRoute: vpcNet, + DefaultGateway: gw, + Name: "test", + ConfDir: t.TempDir(), } } @@ -85,24 +88,45 @@ func TestGenerateConfig_FilenameMatchesName(t *testing.T) { } } -func TestGenerateConfig_ContainsGateway(t *testing.T) { +func TestGenerateConfig_ContainsDefaultGateway(t *testing.T) { conf := newConf(t, "192.168.1.0/29") path, _, _ := GenerateConfig(conf) content, _ := os.ReadFile(path) if !strings.Contains(string(content), "dhcp-option=3,192.168.1.1") { - t.Errorf("gateway absente du fichier généré :\n%s", content) + t.Errorf("dhcp-option=3 absente du fichier généré :\n%s", content) } } -func TestGenerateConfig_NoDefaultRoute(t *testing.T) { +func TestGenerateConfig_NoDefaultGateway(t *testing.T) { conf := newConf(t, "192.168.1.0/29") - conf.DefaultRoute = false + conf.DefaultGateway = nil path, _, _ := GenerateConfig(conf) content, _ := os.ReadFile(path) if strings.Contains(string(content), "dhcp-option=3,") { - t.Errorf("dhcp-option=3 présente alors que DefaultRoute=false :\n%s", content) + t.Errorf("dhcp-option=3 présente alors que DefaultGateway=nil :\n%s", content) + } +} + +func TestGenerateConfig_ContainsVPCRoute(t *testing.T) { + conf := newConf(t, "192.168.1.0/29") + path, _, _ := GenerateConfig(conf) + content, _ := os.ReadFile(path) + + if !strings.Contains(string(content), "dhcp-option=121,10.0.0.0/16,192.168.1.1") { + t.Errorf("dhcp-option=121 absente ou incorrecte :\n%s", content) + } +} + +func TestGenerateConfig_NoVPCRoute(t *testing.T) { + conf := newConf(t, "192.168.1.0/29") + conf.VPCRoute = nil + path, _, _ := GenerateConfig(conf) + content, _ := os.ReadFile(path) + + if strings.Contains(string(content), "dhcp-option=121,") { + t.Errorf("dhcp-option=121 présente alors que VPCRoute=nil :\n%s", content) } } @@ -110,7 +134,6 @@ func TestGenerateConfig_ContainsDhcpRange(t *testing.T) { _, network, _ := net.ParseCIDR("10.10.0.0/24") conf := Config{ Network: network, - Gateway: net.ParseIP("10.10.0.1").To4(), Name: "vpc1", ConfDir: t.TempDir(), } @@ -156,7 +179,6 @@ func TestGenerateConfig_CreatesConfDir(t *testing.T) { _, network, _ := net.ParseCIDR("10.0.0.0/30") conf := Config{ Network: network, - Gateway: net.ParseIP("10.0.0.1").To4(), Name: "net", ConfDir: dir, } diff --git a/internal/dhcp/generate.go b/internal/dhcp/generate.go index 90608f3..2b6c72f 100644 --- a/internal/dhcp/generate.go +++ b/internal/dhcp/generate.go @@ -14,8 +14,11 @@ func GenerateConfig(c Config) (string, map[string]string, error) { var sb strings.Builder fmt.Fprintf(&sb, "no-resolv\n") fmt.Fprintf(&sb, "dhcp-range=%s,static,%s,12h\n", c.Network.IP.String(), mask) - if c.DefaultRoute { - fmt.Fprintf(&sb, "dhcp-option=3,%s\n", c.Gateway.String()) + if c.VPCRoute != nil { + fmt.Fprintf(&sb, "dhcp-option=121,%s,%s\n", c.VPCRoute.String(), c.VPCGateway.String()) + } + if c.DefaultGateway != nil { + fmt.Fprintf(&sb, "dhcp-option=3,%s\n", c.DefaultGateway.String()) } fmt.Fprintf(&sb, "dhcp-option=6,1.1.1.1,8.8.8.8\n\n") diff --git a/internal/dhcp/struct.go b/internal/dhcp/struct.go index d73e052..316667c 100644 --- a/internal/dhcp/struct.go +++ b/internal/dhcp/struct.go @@ -5,9 +5,10 @@ import ( ) type Config struct { - Network *net.IPNet - Gateway net.IP - DefaultRoute bool - Name string - ConfDir string + Network *net.IPNet + VPCGateway net.IP // next-hop for VPCRoute (option 121) + VPCRoute *net.IPNet // if non-nil, emit dhcp-option=121,VPCRoute,VPCGateway + DefaultGateway net.IP // if non-nil, emit dhcp-option=3,DefaultGateway + Name string + ConfDir string } diff --git a/internal/subnet/create.go b/internal/subnet/create.go index 8607328..a3faf46 100644 --- a/internal/subnet/create.go +++ b/internal/subnet/create.go @@ -136,11 +136,22 @@ func setupVxlanHost(d subnetData, vethE string) error { func startDHCP(db *badger.DB, subnetName string, d subnetData) error { conf := dhcp.Config{ - Network: d.cidr, - Gateway: d.interfaceIP, - DefaultRoute: d.mode == "vxlan", - Name: d.vpc + "_" + d.bridge, - ConfDir: "/etc/dnsmasq.d", + Network: d.cidr, + Name: d.vpc + "_" + d.bridge, + ConfDir: "/etc/dnsmasq.d", + } + switch d.mode { + case "vxlan": + conf.VPCGateway = d.interfaceIP + conf.VPCRoute = d.vpcCIDR + case "bridge": + if d.defaultRoute { + gw, err := netif.GetDefaultGateway() + if err != nil { + return fmt.Errorf("get default gateway: %w", err) + } + conf.DefaultGateway = gw + } } _, entries, err := dhcp.GenerateConfig(conf) if err != nil { From b41b4f251802ae3afb59d593d3bab590c3e81f31 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Mon, 18 May 2026 23:25:39 +0200 Subject: [PATCH 13/18] f-28: generate metadata_port automatically at vm creation Signed-off-by: GnomeZworc --- api/agent.yaml | 5 +-- internal/api/agent/models.go | 15 ++++---- internal/api/agent/vms.go | 21 +++++------ internal/dispatcher/agent/vm_commands.go | 47 +++++++++++++++++++----- 4 files changed, 55 insertions(+), 33 deletions(-) diff --git a/api/agent.yaml b/api/agent.yaml index 1476859..e75601d 100644 --- a/api/agent.yaml +++ b/api/agent.yaml @@ -402,14 +402,11 @@ components: VMCreateRequest: type: object - required: [name, metadata_port, interfaces, storage] + required: [name, interfaces, storage] properties: name: type: string example: vm-00001 - metadata_port: - type: string - example: "80" memory: type: integer description: Memory in MB (default 512) diff --git a/internal/api/agent/models.go b/internal/api/agent/models.go index 6535c4c..dc0c47f 100644 --- a/internal/api/agent/models.go +++ b/internal/api/agent/models.go @@ -46,14 +46,13 @@ type VMStorage struct { } type VMCreateRequest struct { - Name string `json:"name"` - MetadataPort string `json:"metadata_port"` - Memory int `json:"memory"` - CPUs int `json:"cpus"` - Password string `json:"password"` - SSHKey string `json:"sshkey"` - Interfaces []VMInterface `json:"interfaces"` - Storage []VMStorage `json:"storage"` + Name string `json:"name"` + Memory int `json:"memory"` + CPUs int `json:"cpus"` + Password string `json:"password"` + SSHKey string `json:"sshkey"` + Interfaces []VMInterface `json:"interfaces"` + Storage []VMStorage `json:"storage"` } type VM struct { diff --git a/internal/api/agent/vms.go b/internal/api/agent/vms.go index 841c429..95f2c85 100644 --- a/internal/api/agent/vms.go +++ b/internal/api/agent/vms.go @@ -58,9 +58,9 @@ func (s *Server) startVM(w http.ResponseWriter, r *http.Request) { json.NewEncoder(w).Encode(ErrorResponse{Error: "invalid request body"}) return } - if req.Name == "" || req.MetadataPort == "" || len(req.Interfaces) == 0 || len(req.Storage) == 0 { + if req.Name == "" || len(req.Interfaces) == 0 || len(req.Storage) == 0 { w.WriteHeader(http.StatusBadRequest) - json.NewEncoder(w).Encode(ErrorResponse{Error: "name, metadata_port, interfaces and storage are required"}) + json.NewEncoder(w).Encode(ErrorResponse{Error: "name, interfaces and storage are required"}) return } @@ -78,15 +78,14 @@ func (s *Server) startVM(w http.ResponseWriter, r *http.Request) { } cmd := dispatcher.StartVMCommand{ - Name: req.Name, - Subnet: primary.Subnet, - IP: primary.IP, - MetadataPort: req.MetadataPort, - VolumePath: req.Storage[0].Path, - Memory: req.Memory, - CPUs: req.CPUs, - Password: req.Password, - SSHKey: req.SSHKey, + Name: req.Name, + Subnet: primary.Subnet, + IP: primary.IP, + VolumePath: req.Storage[0].Path, + Memory: req.Memory, + CPUs: req.CPUs, + Password: req.Password, + SSHKey: req.SSHKey, } if err := s.dispatcher.Prepare(cmd); err != nil { diff --git a/internal/dispatcher/agent/vm_commands.go b/internal/dispatcher/agent/vm_commands.go index aade998..1bb55d4 100644 --- a/internal/dispatcher/agent/vm_commands.go +++ b/internal/dispatcher/agent/vm_commands.go @@ -2,7 +2,9 @@ package dispatcher import ( "fmt" + "math/rand" "strconv" + "strings" "time" configuration "git.g3e.fr/syonad/two/internal/config/agent" @@ -12,15 +14,14 @@ import ( ) type StartVMCommand struct { - Name string - Subnet string - IP string - MetadataPort string - VolumePath string - Memory int - CPUs int - Password string - SSHKey string + Name string + Subnet string + IP string + VolumePath string + Memory int + CPUs int + Password string + SSHKey string } func (c StartVMCommand) Prepare(db *badger.DB, _ *configuration.Config) error { @@ -34,10 +35,14 @@ func (c StartVMCommand) Prepare(db *badger.DB, _ *configuration.Config) error { if subnetState == "deleting" || subnetState == "deleted" { return fmt.Errorf("subnet %q is %s", c.Subnet, subnetState) } + port, err := allocateMetadataPort(db) + if err != nil { + return fmt.Errorf("allocate metadata port: %w", err) + } kv.AddInDB(db, "vm/"+c.Name+"/state", "starting") kv.AddInDB(db, "vm/"+c.Name+"/subnet", c.Subnet) kv.AddInDB(db, "vm/"+c.Name+"/ip", c.IP) - kv.AddInDB(db, "vm/"+c.Name+"/metadata_port", c.MetadataPort) + kv.AddInDB(db, "vm/"+c.Name+"/metadata_port", strconv.Itoa(port)) kv.AddInDB(db, "vm/"+c.Name+"/volume_path", c.VolumePath) kv.AddInDB(db, "vm/"+c.Name+"/memory", strconv.Itoa(c.Memory)) kv.AddInDB(db, "vm/"+c.Name+"/cpus", strconv.Itoa(c.CPUs)) @@ -50,6 +55,28 @@ func (c StartVMCommand) Prepare(db *badger.DB, _ *configuration.Config) error { return nil } +func allocateMetadataPort(db *badger.DB) (int, error) { + entries, err := kv.ListByPrefix(db, "vm/") + if err != nil { + return 0, err + } + used := make(map[int]struct{}) + for key, value := range entries { + if strings.HasSuffix(key, "/metadata_port") { + if p, err := strconv.Atoi(value); err == nil { + used[p] = struct{}{} + } + } + } + for range 100 { + p := rand.Intn(9000) + 1000 + if _, taken := used[p]; !taken { + return p, nil + } + } + return 0, fmt.Errorf("no free metadata port available in [1000, 9999]") +} + func (c StartVMCommand) Execute(db *badger.DB, cfg *configuration.Config) error { timeout := time.After(time.Duration(cfg.Dispatcher.TimeoutSeconds) * time.Second) for { From 732a2938570d146f51bc984776483c4bc46869af Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Thu, 21 May 2026 00:15:45 +0200 Subject: [PATCH 14/18] f-28: fix: debug somme minor errors Signed-off-by: GnomeZworc --- internal/metadata/templates/vendor-data.tmpl | 8 ++------ internal/netif/gateway_linux.go | 8 +++++++- internal/subnet/delete.go | 7 +++++-- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/internal/metadata/templates/vendor-data.tmpl b/internal/metadata/templates/vendor-data.tmpl index 148d6db..fe0dcd8 100644 --- a/internal/metadata/templates/vendor-data.tmpl +++ b/internal/metadata/templates/vendor-data.tmpl @@ -2,12 +2,8 @@ users: - name: syonad lock_passwd: false - gecos: alpine Cloud User - groups: [adm, wheel] - doas: - - permit nopass syonad sudo: ["ALL=(ALL) NOPASSWD:ALL"] - shell: /bin/ash + shell: /bin/bash passwd: "{{ .Password }}" ssh_authorized_keys: - - "{{ .SSHKEY }}" \ No newline at end of file + - "{{ .SSHKEY }}" diff --git a/internal/netif/gateway_linux.go b/internal/netif/gateway_linux.go index 7636b7a..6141c64 100644 --- a/internal/netif/gateway_linux.go +++ b/internal/netif/gateway_linux.go @@ -15,7 +15,13 @@ func GetDefaultGateway() (net.IP, error) { return nil, fmt.Errorf("list routes: %w", err) } for _, r := range routes { - if r.Dst == nil && r.Gw != nil { + if r.Gw == nil { + continue + } + if r.Dst == nil { + return r.Gw, nil + } + if ones, _ := r.Dst.Mask.Size(); ones == 0 { return r.Gw, nil } } diff --git a/internal/subnet/delete.go b/internal/subnet/delete.go index 0ae30b5..f745eda 100644 --- a/internal/subnet/delete.go +++ b/internal/subnet/delete.go @@ -54,8 +54,11 @@ func stopDHCP(db *badger.DB, subnetName string, d subnetData) error { } defer svc.Close() - if err := svc.Stop("dnsmasq@" + d.vpc + "_" + d.bridge + ".service"); err != nil { - return fmt.Errorf("stop dnsmasq: %w", err) + svcName := "dnsmasq@" + d.vpc + "_" + d.bridge + ".service" + if status, err := svc.Status(svcName); err == nil && status.ActiveState == "active" { + if err := svc.Stop(svcName); err != nil { + return fmt.Errorf("stop dnsmasq: %w", err) + } } if err := os.Remove("/etc/dnsmasq.d/" + d.vpc + "_" + d.bridge + ".conf"); err != nil && !os.IsNotExist(err) { From c602725de90f319fc83b6e8f92227aae2f575b1d Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Sat, 23 May 2026 22:22:40 +0200 Subject: [PATCH 15/18] f-28: vm: add param in config file Signed-off-by: GnomeZworc --- conf/agent/config.exemple.yml | 12 ++++++++++++ internal/config/agent/struct.go | 14 ++++++++++++++ 2 files changed, 26 insertions(+) diff --git a/conf/agent/config.exemple.yml b/conf/agent/config.exemple.yml index fdef682..0517eac 100644 --- a/conf/agent/config.exemple.yml +++ b/conf/agent/config.exemple.yml @@ -39,6 +39,18 @@ interfaces: metadata: run_dir: "/run/two/metadata" +# QEMU runtime paths +qemu: + # UEFI firmware (requires apt install ovmf on Debian/Ubuntu) + ovmf_code_path: "/usr/share/OVMF/OVMF_CODE.fd" + ovmf_vars_template: "/usr/share/OVMF/OVMF_VARS.fd" + # Per-VM UEFI variable store (writable copy, created at start / deleted at stop) + uefi_vars_dir: "/run/two/vms/efi" + # QEMU Unix socket directories + serial_dir: "/run/two/vms/serial" + monitor_dir: "/run/two/vms/monitor" + qmp_dir: "/run/two/vms/qmp" + # Admin API (read-only DB inspection, loopback only) admin: enabled: false diff --git a/internal/config/agent/struct.go b/internal/config/agent/struct.go index 9889c79..8b5d406 100644 --- a/internal/config/agent/struct.go +++ b/internal/config/agent/struct.go @@ -36,6 +36,14 @@ type Config struct { Address string `mapstructure:"address"` Port int `mapstructure:"port"` } `mapstructure:"admin"` + QEMU struct { + OVMFCodePath string `mapstructure:"ovmf_code_path"` + OVMFVarsTemplate string `mapstructure:"ovmf_vars_template"` + UEFIVarsDir string `mapstructure:"uefi_vars_dir"` + SerialDir string `mapstructure:"serial_dir"` + MonitorDir string `mapstructure:"monitor_dir"` + QMPDir string `mapstructure:"qmp_dir"` + } `mapstructure:"qemu"` DefaultInterface string `mapstructure:"default_interface"` Interfaces map[string]string `mapstructure:"interfaces"` } @@ -55,6 +63,12 @@ func LoadConfig(path string) (*Config, error) { v.SetDefault("dispatcher.timeout_seconds", 300) v.SetDefault("dispatcher.poll_seconds", 2) v.SetDefault("metadata.run_dir", "/run/two/metadata") + v.SetDefault("qemu.ovmf_code_path", "/usr/share/OVMF/OVMF_CODE.fd") + v.SetDefault("qemu.ovmf_vars_template", "/usr/share/OVMF/OVMF_VARS.fd") + v.SetDefault("qemu.uefi_vars_dir", "/run/two/vms/uefi") + v.SetDefault("qemu.serial_dir", "/run/two/vms/serial") + v.SetDefault("qemu.monitor_dir", "/run/two/vms/monitor") + v.SetDefault("qemu.qmp_dir", "/run/two/vms/qmp") v.SetDefault("admin.enabled", false) v.SetDefault("admin.address", "127.0.0.1") v.SetDefault("admin.port", 9091) From 325f1acff530123851148966f501f3a2c303ecde Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Sat, 23 May 2026 22:26:21 +0200 Subject: [PATCH 16/18] f-28: api: add uefi params Signed-off-by: GnomeZworc --- api/agent.yaml | 7 +++++++ internal/api/agent/models.go | 2 ++ internal/api/agent/vm.go | 1 + internal/api/agent/vms.go | 1 + internal/dispatcher/agent/vm_commands.go | 4 ++++ 5 files changed, 15 insertions(+) diff --git a/api/agent.yaml b/api/agent.yaml index e75601d..7e9c461 100644 --- a/api/agent.yaml +++ b/api/agent.yaml @@ -430,6 +430,10 @@ components: minItems: 1 items: $ref: "#/components/schemas/VMStorage" + uefi: + type: boolean + description: Boot with UEFI firmware (OVMF). Defaults to false (SeaBIOS). + example: false VMInterface: type: object @@ -487,6 +491,9 @@ components: type: array items: $ref: "#/components/schemas/VMStorage" + uefi: + type: boolean + example: false Error: type: object diff --git a/internal/api/agent/models.go b/internal/api/agent/models.go index dc0c47f..079d8db 100644 --- a/internal/api/agent/models.go +++ b/internal/api/agent/models.go @@ -49,6 +49,7 @@ type VMCreateRequest struct { Name string `json:"name"` Memory int `json:"memory"` CPUs int `json:"cpus"` + UEFI bool `json:"uefi"` Password string `json:"password"` SSHKey string `json:"sshkey"` Interfaces []VMInterface `json:"interfaces"` @@ -61,6 +62,7 @@ type VM struct { MetadataPort string `json:"metadata_port"` Memory int `json:"memory"` CPUs int `json:"cpus"` + UEFI bool `json:"uefi"` Interfaces []VMInterface `json:"interfaces"` Storage []VMStorage `json:"storage"` } diff --git a/internal/api/agent/vm.go b/internal/api/agent/vm.go index a150d16..f932766 100644 --- a/internal/api/agent/vm.go +++ b/internal/api/agent/vm.go @@ -79,6 +79,7 @@ func vmFromDB(name string, entries map[string]string) (VM, error) { vm.MetadataPort = entries[prefix+"metadata_port"] vm.Memory, _ = strconv.Atoi(entries[prefix+"memory"]) vm.CPUs, _ = strconv.Atoi(entries[prefix+"cpus"]) + vm.UEFI = entries[prefix+"uefi"] == "true" subnet := entries[prefix+"subnet"] ip := entries[prefix+"ip"] diff --git a/internal/api/agent/vms.go b/internal/api/agent/vms.go index 95f2c85..4dc6136 100644 --- a/internal/api/agent/vms.go +++ b/internal/api/agent/vms.go @@ -84,6 +84,7 @@ func (s *Server) startVM(w http.ResponseWriter, r *http.Request) { VolumePath: req.Storage[0].Path, Memory: req.Memory, CPUs: req.CPUs, + UEFI: req.UEFI, Password: req.Password, SSHKey: req.SSHKey, } diff --git a/internal/dispatcher/agent/vm_commands.go b/internal/dispatcher/agent/vm_commands.go index 1bb55d4..1c4bbce 100644 --- a/internal/dispatcher/agent/vm_commands.go +++ b/internal/dispatcher/agent/vm_commands.go @@ -20,6 +20,7 @@ type StartVMCommand struct { VolumePath string Memory int CPUs int + UEFI bool Password string SSHKey string } @@ -46,6 +47,9 @@ func (c StartVMCommand) Prepare(db *badger.DB, _ *configuration.Config) error { kv.AddInDB(db, "vm/"+c.Name+"/volume_path", c.VolumePath) kv.AddInDB(db, "vm/"+c.Name+"/memory", strconv.Itoa(c.Memory)) kv.AddInDB(db, "vm/"+c.Name+"/cpus", strconv.Itoa(c.CPUs)) + if c.UEFI { + kv.AddInDB(db, "vm/"+c.Name+"/uefi", "true") + } if c.Password != "" { kv.AddInDB(db, "vm/"+c.Name+"/password", c.Password) } From ec613996a05bf5cda0dd86bb187662924b7f672e Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Sat, 23 May 2026 22:28:19 +0200 Subject: [PATCH 17/18] f-28: vms: Add uefi param Signed-off-by: GnomeZworc --- internal/vm/create.go | 55 ++++++++++++++++++++++++++++++++++++------- internal/vm/data.go | 6 ++++- internal/vm/delete.go | 9 ++++++- 3 files changed, 60 insertions(+), 10 deletions(-) diff --git a/internal/vm/create.go b/internal/vm/create.go index f3e9d34..529c73c 100644 --- a/internal/vm/create.go +++ b/internal/vm/create.go @@ -2,6 +2,9 @@ package vm import ( "fmt" + "io" + "os" + "path/filepath" configuration "git.g3e.fr/syonad/two/internal/config/agent" "git.g3e.fr/syonad/two/internal/iptables" @@ -49,18 +52,54 @@ func StartVM(db *badger.DB, name string, cfg *configuration.Config) error { return fmt.Errorf("start metadata: %w", err) } + qcfg := qemu.Config{ + Name: name, + TapID: d.tapID, + Mac: d.mac, + VolumePath: d.volumePath, + Memory: d.memory, + CPUs: d.cpus, + SerialDir: cfg.QEMU.SerialDir, + MonitorDir: cfg.QEMU.MonitorDir, + QMPDir: cfg.QEMU.QMPDir, + } + + if d.uefi { + varsPath := filepath.Join(cfg.QEMU.UEFIVarsDir, name+"-uefi-vars.fd") + if err := copyFile(cfg.QEMU.OVMFVarsTemplate, varsPath); err != nil { + return fmt.Errorf("copy uefi vars: %w", err) + } + qcfg.UEFICodePath = cfg.QEMU.OVMFCodePath + qcfg.UEFIVarsPath = varsPath + } + if err := netns.Call(d.vpcName, func() error { - return qemu.Start(qemu.Config{ - Name: name, - TapID: d.tapID, - Mac: d.mac, - VolumePath: d.volumePath, - Memory: d.memory, - CPUs: d.cpus, - }) + return qemu.Start(qcfg) }); err != nil { return fmt.Errorf("start qemu: %w", err) } return kv.AddInDB(db, "vm/"+name+"/state", "started") } + +func copyFile(src, dst string) error { + if err := os.MkdirAll(filepath.Dir(dst), 0755); err != nil { + return err + } + in, err := os.Open(src) + if err != nil { + return err + } + defer in.Close() + + out, err := os.Create(dst) + if err != nil { + return err + } + defer out.Close() + + if _, err := io.Copy(out, in); err != nil { + return err + } + return out.Sync() +} diff --git a/internal/vm/data.go b/internal/vm/data.go index df5c051..1e2644e 100644 --- a/internal/vm/data.go +++ b/internal/vm/data.go @@ -14,7 +14,7 @@ import ( type vmData struct { subnetName string vpcName string - interfaceIP string + interfaceIP string bridge string tapID int ip string @@ -23,6 +23,7 @@ type vmData struct { volumePath string memory int cpus int + uefi bool password string sshkey string } @@ -105,6 +106,9 @@ func loadVM(db *badger.DB, name string) (vmData, error) { return d, fmt.Errorf("parse cpus: %w", err) } + if v, _ := kv.GetFromDB(db, "vm/"+name+"/uefi"); v == "true" { + d.uefi = true + } d.password, _ = kv.GetFromDB(db, "vm/"+name+"/password") d.sshkey, _ = kv.GetFromDB(db, "vm/"+name+"/sshkey") diff --git a/internal/vm/delete.go b/internal/vm/delete.go index 79a4c72..7e47f3f 100644 --- a/internal/vm/delete.go +++ b/internal/vm/delete.go @@ -2,6 +2,8 @@ package vm import ( "fmt" + "os" + "path/filepath" "time" configuration "git.g3e.fr/syonad/two/internal/config/agent" @@ -29,7 +31,7 @@ func StopVM(db *badger.DB, name string, cfg *configuration.Config) error { return err } - socketPath := fmt.Sprintf("/tmp/%s.qmp-sock", name) + socketPath := filepath.Join(cfg.QEMU.QMPDir, name+".sock") if _, err := qmp.Send(socketPath, []string{`{"execute":"system_powerdown"}`}); err != nil { return fmt.Errorf("qmp system_powerdown: %w", err) @@ -65,5 +67,10 @@ func StopVM(db *badger.DB, name string, cfg *configuration.Config) error { return fmt.Errorf("delete tap: %w", err) } + if d.uefi { + varsPath := filepath.Join(cfg.QEMU.UEFIVarsDir, name+"-uefi-vars.fd") + os.Remove(varsPath) + } + return kv.AddInDB(db, "vm/"+name+"/state", "stopped") } From 2a5473eb22cd65a0bd1dbf9faf991d9ebfb9fd19 Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Sat, 23 May 2026 22:30:32 +0200 Subject: [PATCH 18/18] f-28: qemu: execute with uefi vars Signed-off-by: GnomeZworc --- internal/qemu/start_linux.go | 39 ++++++++++++++++++++++++++++++++---- internal/qemu/start_other.go | 5 +++++ 2 files changed, 40 insertions(+), 4 deletions(-) diff --git a/internal/qemu/start_linux.go b/internal/qemu/start_linux.go index 6119278..3f40e73 100644 --- a/internal/qemu/start_linux.go +++ b/internal/qemu/start_linux.go @@ -4,7 +4,9 @@ package qemu import ( "fmt" + "os" "os/exec" + "path/filepath" ) type Config struct { @@ -14,6 +16,11 @@ type Config struct { VolumePath string Memory int CPUs int + UEFICodePath string + UEFIVarsPath string + SerialDir string + MonitorDir string + QMPDir string } func Start(cfg Config) error { @@ -27,20 +34,44 @@ func Start(cfg Config) error { cpus = 1 } - cmd := exec.Command("qemu-system-x86_64", + for _, dir := range []string{cfg.SerialDir, cfg.MonitorDir, cfg.QMPDir} { + if dir != "" { + if err := os.MkdirAll(dir, 0755); err != nil { + return fmt.Errorf("mkdir %s: %w", dir, err) + } + } + } + + serialSock := filepath.Join(cfg.SerialDir, cfg.Name+".sock") + monitorSock := filepath.Join(cfg.MonitorDir, cfg.Name+".sock") + qmpSock := filepath.Join(cfg.QMPDir, cfg.Name+".sock") + + args := []string{ "-enable-kvm", "-cpu", "host", "-m", fmt.Sprintf("%d", memory), "-smp", fmt.Sprintf("%d", cpus), - "-serial", fmt.Sprintf("unix:/tmp/%s.sock,server,nowait", cfg.Name), - "-monitor", fmt.Sprintf("unix:/tmp/%s.mon-sock,server,nowait", cfg.Name), - "-qmp", fmt.Sprintf("unix:/tmp/%s.qmp-sock,server,nowait", cfg.Name), + "-serial", fmt.Sprintf("unix:%s,server,nowait", serialSock), + "-monitor", fmt.Sprintf("unix:%s,server,nowait", monitorSock), + "-qmp", fmt.Sprintf("unix:%s,server,nowait", qmpSock), "-display", "none", + } + + if cfg.UEFICodePath != "" && cfg.UEFIVarsPath != "" { + args = append(args, + "-drive", fmt.Sprintf("if=pflash,format=raw,readonly=on,file=%s", cfg.UEFICodePath), + "-drive", fmt.Sprintf("if=pflash,format=raw,file=%s", cfg.UEFIVarsPath), + ) + } + + args = append(args, "-drive", fmt.Sprintf("file=%s,if=virtio", cfg.VolumePath), "-netdev", fmt.Sprintf("tap,id=net0,ifname=tap%d,script=no,downscript=no", cfg.TapID), "-device", fmt.Sprintf("virtio-net-pci,netdev=net0,mac=%s", cfg.Mac), "-daemonize", ) + + cmd := exec.Command("qemu-system-x86_64", args...) if err := cmd.Run(); err != nil { return fmt.Errorf("qemu-system-x86_64: %w", err) } diff --git a/internal/qemu/start_other.go b/internal/qemu/start_other.go index 782a7ee..c9c9192 100644 --- a/internal/qemu/start_other.go +++ b/internal/qemu/start_other.go @@ -7,6 +7,11 @@ import "errors" type Config struct { Name, Mac, VolumePath string TapID, Memory, CPUs int + UEFICodePath string + UEFIVarsPath string + SerialDir string + MonitorDir string + QMPDir string } func Start(_ Config) error {