diff --git a/api/agent.yaml b/api/agent.yaml index 7e9c461..00d4fd8 100644 --- a/api/agent.yaml +++ b/api/agent.yaml @@ -294,17 +294,13 @@ components: VPCCreateRequest: type: object - required: [name, cidr] + required: [name] 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 @@ -316,13 +312,10 @@ components: type: string enum: [creating, created, deleting, deleted] example: created - cidr: - type: string - example: "10.0.0.0/16" SubnetCreateRequest: type: object - required: [name, vpc, interface_ip, cidr] + required: [name, vpc, vxlan_id, gateway_ip, cidr] properties: name: type: string @@ -332,24 +325,15 @@ 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. Required when mode is "vxlan", ignored otherwise. + description: VXLAN VNI identifier example: 100 iface_type: 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 - interface_ip: + gateway_ip: type: string format: ipv4 description: Gateway IP for the subnet @@ -358,12 +342,6 @@ 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 @@ -378,35 +356,30 @@ 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 from agent config + description: Resolved interface name example: br-000000 - interface_ip: + gateway_ip: type: string example: "10.10.10.1" cidr: type: string example: "10.10.10.0/24" - default_route: - type: boolean - example: false VMCreateRequest: type: object - required: [name, interfaces, storage] + required: [name, metadata_port, interfaces, storage] properties: name: type: string example: vm-00001 + metadata_port: + type: string + example: "80" memory: type: integer description: Memory in MB (default 512) @@ -430,10 +403,6 @@ 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 @@ -491,9 +460,6 @@ components: type: array items: $ref: "#/components/schemas/VMStorage" - uefi: - type: boolean - example: false Error: type: object diff --git a/cmd/agent/main.go b/cmd/agent/main.go index 7083076..7b87bde 100644 --- a/cmd/agent/main.go +++ b/cmd/agent/main.go @@ -51,10 +51,6 @@ func main() { d := dispatcher.New(q, db, cfg, log.With(slog.String("component", "dispatcher"))) go agentapi.New(d, db, log.With(slog.String("component", "api"))).Start(apiAddr) go promserver.Start(promAddr, registry) - if cfg.Admin.Enabled { - adminAddr := fmt.Sprintf("%s:%d", cfg.Admin.Address, cfg.Admin.Port) - go kv.NewAdminServer(db, log.With(slog.String("component", "admin"))).Start(adminAddr) - } select {} } diff --git a/conf/agent/config.exemple.yml b/conf/agent/config.exemple.yml index 0517eac..89eb90f 100644 --- a/conf/agent/config.exemple.yml +++ b/conf/agent/config.exemple.yml @@ -39,24 +39,6 @@ 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 - address: "127.0.0.1" - port: 9091 - # Logging configuration logger: # Log level: debug, info, warn, error (default: info) diff --git a/internal/api/agent/models.go b/internal/api/agent/models.go index 079d8db..f13407b 100644 --- a/internal/api/agent/models.go +++ b/internal/api/agent/models.go @@ -2,36 +2,30 @@ 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 { - 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"` + Name string `json:"name"` + VPC string `json:"vpc"` + VxlanID int `json:"vxlan_id"` + IfaceType string `json:"iface_type"` + GatewayIP string `json:"gateway_ip"` + CIDR string `json:"cidr"` } 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"` - DefaultRoute bool `json:"default_route"` + Name string `json:"name"` + State string `json:"state"` + VPC string `json:"vpc"` + VxlanID int `json:"vxlan_id"` + LocalIface string `json:"local_iface"` + GatewayIP string `json:"gateway_ip"` + CIDR string `json:"cidr"` } type VMInterface struct { @@ -46,14 +40,14 @@ type VMStorage struct { } 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"` - Storage []VMStorage `json:"storage"` + 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"` } type VM struct { @@ -62,7 +56,6 @@ 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/subnet.go b/internal/api/agent/subnet.go index 36ee9d7..31eddc8 100644 --- a/internal/api/agent/subnet.go +++ b/internal/api/agent/subnet.go @@ -47,18 +47,14 @@ 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": sub.LocalIface = value - case "interface_ip": - sub.InterfaceIP = value + case "gateway_ip": + sub.GatewayIP = value case "cidr": sub.CIDR = value - case "default_route": - sub.DefaultRoute = value == "true" } } w.WriteHeader(http.StatusOK) diff --git a/internal/api/agent/subnet_test.go b/internal/api/agent/subnet_test.go index 36e42f7..23745a0 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", - InterfaceIP: "10.0.0.1", + GatewayIP: "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", - InterfaceIP: "10.0.0.1", + GatewayIP: "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", - InterfaceIP: "10.0.0.1", + GatewayIP: "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", - InterfaceIP: "10.0.0.1", + GatewayIP: "10.0.0.1", CIDR: "10.0.0.0/24", } body, _ := json.Marshal(req) @@ -150,52 +150,7 @@ func TestPostSubnet_VPCDeleting(t *testing.T) { Name: "sn-1", VPC: "vpc-dying", IfaceType: "vms", - InterfaceIP: "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_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", - InterfaceIP: "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", - InterfaceIP: "10.0.0.1", + GatewayIP: "10.0.0.1", CIDR: "10.0.0.0/24", } body, _ := json.Marshal(req) @@ -222,7 +177,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/interface_ip", "10.0.0.1") + kv.AddInDB(db, "subnet/sn-1/gateway_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 3cea247..60467aa 100644 --- a/internal/api/agent/subnets.go +++ b/internal/api/agent/subnets.go @@ -44,18 +44,14 @@ 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": subnets[name].LocalIface = value - case "interface_ip": - subnets[name].InterfaceIP = value + case "gateway_ip": + subnets[name].GatewayIP = value case "cidr": subnets[name].CIDR = value - case "default_route": - subnets[name].DefaultRoute = value == "true" } } result := make([]Subnet, 0, len(subnets)) @@ -73,20 +69,18 @@ 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.InterfaceIP == "" || req.CIDR == "" { + if req.Name == "" || req.VPC == "" || req.GatewayIP == "" || req.CIDR == "" { w.WriteHeader(http.StatusBadRequest) - json.NewEncoder(w).Encode(ErrorResponse{Error: "name, vpc, interface_ip and cidr are required"}) + json.NewEncoder(w).Encode(ErrorResponse{Error: "name, vpc, gateway_ip and cidr are required"}) 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, - DefaultRoute: req.DefaultRoute, + Name: req.Name, + VPC: req.VPC, + VxlanID: req.VxlanID, + IfaceType: req.IfaceType, + GatewayIP: req.GatewayIP, + CIDR: req.CIDR, } if err := s.dispatcher.Prepare(cmd); err != nil { if _, dbErr := kv.GetFromDB(s.db, "subnet/"+req.Name+"/state"); dbErr == nil { @@ -115,18 +109,14 @@ 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": sub.LocalIface = value - case "interface_ip": - sub.InterfaceIP = value + case "gateway_ip": + sub.GatewayIP = value case "cidr": sub.CIDR = value - case "default_route": - sub.DefaultRoute = value == "true" } } w.WriteHeader(http.StatusAccepted) diff --git a/internal/api/agent/vm.go b/internal/api/agent/vm.go index d9f6bf5..a150d16 100644 --- a/internal/api/agent/vm.go +++ b/internal/api/agent/vm.go @@ -79,7 +79,6 @@ 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"] @@ -87,11 +86,8 @@ func vmFromDB(name string, entries map[string]string) (VM, error) { vm.Interfaces = []VMInterface{{Subnet: subnet, IP: ip, Primary: true}} } - diskPrefix := prefix + "disk/" - for key, path := range entries { - if dev := strings.TrimPrefix(key, diskPrefix); dev != key { - vm.Storage = append(vm.Storage, VMStorage{Path: path, Dev: dev}) - } + if path := entries[prefix+"volume_path"]; path != "" { + vm.Storage = []VMStorage{{Path: path}} } return vm, nil diff --git a/internal/api/agent/vm_test.go b/internal/api/agent/vm_test.go deleted file mode 100644 index 3af5968..0000000 --- a/internal/api/agent/vm_test.go +++ /dev/null @@ -1,158 +0,0 @@ -package agentapi - -import ( - "bytes" - "encoding/json" - "net/http" - "net/http/httptest" - "sort" - "testing" - - "git.g3e.fr/syonad/two/pkg/db/kv" -) - -// --- vmFromDB --- - -func TestVmFromDB_SingleDisk(t *testing.T) { - entries := map[string]string{ - "vm/vm-1/state": "started", - "vm/vm-1/subnet": "sn-1", - "vm/vm-1/ip": "10.0.0.5", - "vm/vm-1/metadata_port": "1234", - "vm/vm-1/memory": "512", - "vm/vm-1/cpus": "1", - "vm/vm-1/disk/sda": "/data/root.qcow2", - } - vm, err := vmFromDB("vm-1", entries) - if err != nil { - t.Fatalf("vmFromDB a échoué : %v", err) - } - if len(vm.Storage) != 1 { - t.Fatalf("attendu 1 disque, obtenu %d", len(vm.Storage)) - } - if vm.Storage[0].Dev != "sda" || vm.Storage[0].Path != "/data/root.qcow2" { - t.Errorf("disque inattendu : %+v", vm.Storage[0]) - } -} - -func TestVmFromDB_MultiDisk(t *testing.T) { - entries := map[string]string{ - "vm/vm-2/state": "started", - "vm/vm-2/subnet": "sn-1", - "vm/vm-2/ip": "10.0.0.6", - "vm/vm-2/metadata_port": "1235", - "vm/vm-2/memory": "1024", - "vm/vm-2/cpus": "2", - "vm/vm-2/disk/sda": "/data/root.qcow2", - "vm/vm-2/disk/sdb": "/data/data.qcow2", - } - vm, err := vmFromDB("vm-2", entries) - if err != nil { - t.Fatalf("vmFromDB a échoué : %v", err) - } - if len(vm.Storage) != 2 { - t.Fatalf("attendu 2 disques, obtenu %d", len(vm.Storage)) - } - sort.Slice(vm.Storage, func(i, j int) bool { return vm.Storage[i].Dev < vm.Storage[j].Dev }) - if vm.Storage[0].Dev != "sda" || vm.Storage[1].Dev != "sdb" { - t.Errorf("devs attendus [sda sdb], obtenus [%s %s]", vm.Storage[0].Dev, vm.Storage[1].Dev) - } -} - -func TestVmFromDB_SlotGap(t *testing.T) { - // sdb absent — sda et sdc seulement - entries := map[string]string{ - "vm/vm-3/state": "started", - "vm/vm-3/subnet": "sn-1", - "vm/vm-3/ip": "10.0.0.7", - "vm/vm-3/metadata_port": "1236", - "vm/vm-3/memory": "512", - "vm/vm-3/cpus": "1", - "vm/vm-3/disk/sda": "/data/root.qcow2", - "vm/vm-3/disk/sdc": "/data/extra.qcow2", - } - vm, err := vmFromDB("vm-3", entries) - if err != nil { - t.Fatalf("vmFromDB a échoué : %v", err) - } - if len(vm.Storage) != 2 { - t.Fatalf("attendu 2 disques, obtenu %d", len(vm.Storage)) - } - devs := map[string]bool{} - for _, s := range vm.Storage { - devs[s.Dev] = true - } - if !devs["sda"] || !devs["sdc"] { - t.Errorf("attendu sda et sdc, obtenus %v", devs) - } - if devs["sdb"] { - t.Error("sdb ne devrait pas apparaître") - } -} - -// --- POST /vms --- - -func TestStartVM_MultiDisk(t *testing.T) { - s, db := newTestServer(t) - kv.AddInDB(db, "subnet/sn-1/state", "created") - kv.AddInDB(db, "subnet/sn-1/vpc", "vpc-1") - - body, _ := json.Marshal(VMCreateRequest{ - Name: "vm-10", - Interfaces: []VMInterface{ - {Subnet: "sn-1", IP: "10.0.0.10", Primary: true}, - }, - Storage: []VMStorage{ - {Path: "/data/root.qcow2", Dev: "sda"}, - {Path: "/data/data.qcow2", Dev: "sdb"}, - }, - Memory: 1024, - CPUs: 2, - }) - - w := httptest.NewRecorder() - s.VmsHandler(w, httptest.NewRequest(http.MethodPost, "/vms", bytes.NewReader(body))) - if w.Code != http.StatusAccepted { - t.Fatalf("attendu 202, obtenu %d : %s", w.Code, w.Body.String()) - } - - for _, dev := range []string{"sda", "sdb"} { - if _, err := kv.GetFromDB(db, "vm/vm-10/disk/"+dev); err != nil { - t.Errorf("disk/%s absent en DB après création", dev) - } - } - if _, err := kv.GetFromDB(db, "vm/vm-10/volume_path"); err == nil { - t.Error("volume_path ne devrait plus exister en DB") - } -} - -func TestStartVM_StorageReturnedInResponse(t *testing.T) { - s, db := newTestServer(t) - kv.AddInDB(db, "subnet/sn-1/state", "created") - kv.AddInDB(db, "subnet/sn-1/vpc", "vpc-1") - - body, _ := json.Marshal(VMCreateRequest{ - Name: "vm-11", - Interfaces: []VMInterface{ - {Subnet: "sn-1", IP: "10.0.0.11", Primary: true}, - }, - Storage: []VMStorage{ - {Path: "/data/root.qcow2", Dev: "sda"}, - }, - }) - - w := httptest.NewRecorder() - s.VmsHandler(w, httptest.NewRequest(http.MethodPost, "/vms", bytes.NewReader(body))) - if w.Code != http.StatusAccepted { - t.Fatalf("attendu 202, obtenu %d", w.Code) - } - - var vm VM - json.NewDecoder(w.Body).Decode(&vm) - if len(vm.Storage) != 1 { - t.Fatalf("attendu 1 disque dans la réponse, obtenu %d", len(vm.Storage)) - } - if vm.Storage[0].Dev != "sda" || vm.Storage[0].Path != "/data/root.qcow2" { - t.Errorf("disque inattendu dans la réponse : %+v", vm.Storage[0]) - } -} diff --git a/internal/api/agent/vms.go b/internal/api/agent/vms.go index 2ea5748..841c429 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 == "" || len(req.Interfaces) == 0 || len(req.Storage) == 0 { + if req.Name == "" || req.MetadataPort == "" || len(req.Interfaces) == 0 || len(req.Storage) == 0 { w.WriteHeader(http.StatusBadRequest) - json.NewEncoder(w).Encode(ErrorResponse{Error: "name, interfaces and storage are required"}) + json.NewEncoder(w).Encode(ErrorResponse{Error: "name, metadata_port, interfaces and storage are required"}) return } @@ -77,21 +77,16 @@ func (s *Server) startVM(w http.ResponseWriter, r *http.Request) { return } - disks := make([]dispatcher.VMDisk, len(req.Storage)) - for i, s := range req.Storage { - disks[i] = dispatcher.VMDisk{Path: s.Path, Dev: s.Dev} - } - cmd := dispatcher.StartVMCommand{ - Name: req.Name, - Subnet: primary.Subnet, - IP: primary.IP, - Disks: disks, - Memory: req.Memory, - CPUs: req.CPUs, - UEFI: req.UEFI, - Password: req.Password, - SSHKey: req.SSHKey, + 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, } if err := s.dispatcher.Prepare(cmd); err != nil { diff --git a/internal/api/agent/vpc.go b/internal/api/agent/vpc.go index bb3f5d7..43cc33c 100644 --- a/internal/api/agent/vpc.go +++ b/internal/api/agent/vpc.go @@ -35,9 +35,8 @@ 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, CIDR: cidr}) + json.NewEncoder(w).Encode(VPC{Name: name, State: state}) } 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 3516305..01308a5 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", CIDR: "10.0.0.0/16"}) + 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.StatusAccepted { @@ -67,34 +67,11 @@ 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{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"}) + body, _ := json.Marshal(VPCCreateRequest{}) w := httptest.NewRecorder() s.VpcsHandler(w, httptest.NewRequest(http.MethodPost, "/vpcs", bytes.NewReader(body))) if w.Code != http.StatusBadRequest { @@ -105,7 +82,7 @@ func TestPostVpc_InvalidCIDR(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", CIDR: "10.0.0.0/16"}) + body, _ := json.Marshal(VPCCreateRequest{Name: "vpc-exist"}) 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 905cdee..b062d1c 100644 --- a/internal/api/agent/vpcs.go +++ b/internal/api/agent/vpcs.go @@ -2,7 +2,6 @@ package agentapi import ( "encoding/json" - "net" "net/http" "strings" @@ -39,11 +38,8 @@ func (s *Server) listVpcs(w http.ResponseWriter, _ *http.Request) { if _, ok := vpcs[name]; !ok { vpcs[name] = &VPC{Name: name} } - switch parts[2] { - case "state": + if parts[2] == "state" { vpcs[name].State = value - case "cidr": - vpcs[name].CIDR = value } } result := make([]VPC, 0, len(vpcs)) @@ -66,17 +62,7 @@ func (s *Server) postVpc(w http.ResponseWriter, r *http.Request) { json.NewEncoder(w).Encode(ErrorResponse{Error: "name is required"}) return } - 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} + cmd := dispatcher.CreateVPCCommand{Name: req.Name} if err := s.dispatcher.Prepare(cmd); err != nil { w.WriteHeader(http.StatusConflict) json.NewEncoder(w).Encode(ErrorResponse{Error: err.Error()}) @@ -90,5 +76,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, CIDR: req.CIDR}) + json.NewEncoder(w).Encode(VPC{Name: req.Name, State: state}) } diff --git a/internal/config/agent/struct.go b/internal/config/agent/struct.go index 8b5d406..69a4492 100644 --- a/internal/config/agent/struct.go +++ b/internal/config/agent/struct.go @@ -31,19 +31,6 @@ type Config struct { Metadata struct { RunDir string `mapstructure:"run_dir"` } `mapstructure:"metadata"` - Admin struct { - Enabled bool `mapstructure:"enabled"` - 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"` } @@ -63,15 +50,6 @@ 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) v.SetDefault("default_interface", "br-000000") v.SetDefault("logger.level", "info") v.SetDefault("logger.debug", false) diff --git a/internal/dhcp/dhcp_test.go b/internal/dhcp/dhcp_test.go index a2d5e60..1681fec 100644 --- a/internal/dhcp/dhcp_test.go +++ b/internal/dhcp/dhcp_test.go @@ -51,15 +51,11 @@ 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, - VPCGateway: gw, - VPCRoute: vpcNet, - DefaultGateway: gw, - Name: "test", - ConfDir: t.TempDir(), + Network: network, + Gateway: net.ParseIP("192.168.1.1").To4(), + Name: "test", + ConfDir: t.TempDir(), } } @@ -88,45 +84,13 @@ func TestGenerateConfig_FilenameMatchesName(t *testing.T) { } } -func TestGenerateConfig_ContainsDefaultGateway(t *testing.T) { +func TestGenerateConfig_ContainsGateway(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("dhcp-option=3 absente du fichier généré :\n%s", content) - } -} - -func TestGenerateConfig_NoDefaultGateway(t *testing.T) { - conf := newConf(t, "192.168.1.0/29") - 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 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) + t.Errorf("gateway absente du fichier généré :\n%s", content) } } @@ -134,6 +98,7 @@ 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(), } @@ -179,6 +144,7 @@ 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 2b6c72f..3c46fe2 100644 --- a/internal/dhcp/generate.go +++ b/internal/dhcp/generate.go @@ -14,12 +14,7 @@ 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.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=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 316667c..4c69b9c 100644 --- a/internal/dhcp/struct.go +++ b/internal/dhcp/struct.go @@ -5,10 +5,8 @@ import ( ) type Config struct { - 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 + Network *net.IPNet + Gateway net.IP + Name string + ConfDir string } diff --git a/internal/dispatcher/agent/subnet_commands.go b/internal/dispatcher/agent/subnet_commands.go index e488842..18f2cd3 100644 --- a/internal/dispatcher/agent/subnet_commands.go +++ b/internal/dispatcher/agent/subnet_commands.go @@ -12,23 +12,15 @@ import ( ) type CreateSubnetCommand struct { - Name string - VPC string - Mode string - VxlanID int - IfaceType string - InterfaceIP string - CIDR string - DefaultRoute bool + Name string + VPC string + VxlanID int + IfaceType string + GatewayIP string + CIDR string } 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) } @@ -45,14 +37,10 @@ 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+"/mode", c.Mode) + kv.AddInDB(db, "subnet/"+c.Name+"/vxlan_id", strconv.Itoa(c.VxlanID)) 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+"/gateway_ip", c.GatewayIP) 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)) - } return nil } diff --git a/internal/dispatcher/agent/subnet_commands_test.go b/internal/dispatcher/agent/subnet_commands_test.go index b6aacee..3b118bc 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", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", + 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) @@ -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", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", + IfaceType: "vms", GatewayIP: "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", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", + IfaceType: "inconnu", GatewayIP: "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", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", + 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 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", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", + 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 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", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", + 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 si le VPC est en cours de suppression") @@ -104,109 +104,13 @@ 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", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24", + 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 si le VPC est supprimé") } } -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", InterfaceIP: "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", 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) - } - 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", 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 { - 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", 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") - } -} - -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/dispatcher/agent/vm_commands.go b/internal/dispatcher/agent/vm_commands.go index bdfeaec..aade998 100644 --- a/internal/dispatcher/agent/vm_commands.go +++ b/internal/dispatcher/agent/vm_commands.go @@ -2,9 +2,7 @@ package dispatcher import ( "fmt" - "math/rand" "strconv" - "strings" "time" configuration "git.g3e.fr/syonad/two/internal/config/agent" @@ -13,21 +11,16 @@ import ( "github.com/dgraph-io/badger/v4" ) -type VMDisk struct { - Path string - Dev string -} - type StartVMCommand struct { - Name string - Subnet string - IP string - Disks []VMDisk - Memory int - CPUs int - UEFI bool - Password string - SSHKey string + Name string + Subnet string + IP string + MetadataPort string + VolumePath string + Memory int + CPUs int + Password string + SSHKey string } func (c StartVMCommand) Prepare(db *badger.DB, _ *configuration.Config) error { @@ -41,22 +34,13 @@ 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", strconv.Itoa(port)) - for _, d := range c.Disks { - kv.AddInDB(db, "vm/"+c.Name+"/disk/"+d.Dev, d.Path) - } + kv.AddInDB(db, "vm/"+c.Name+"/metadata_port", c.MetadataPort) + 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) } @@ -66,28 +50,6 @@ 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 { diff --git a/internal/dispatcher/agent/vm_commands_test.go b/internal/dispatcher/agent/vm_commands_test.go deleted file mode 100644 index ba400b9..0000000 --- a/internal/dispatcher/agent/vm_commands_test.go +++ /dev/null @@ -1,130 +0,0 @@ -package dispatcher - -import ( - "testing" - - "git.g3e.fr/syonad/two/pkg/db/kv" -) - -// --- StartVMCommand.Prepare : écriture des disques en DB --- - -func TestStartVMCommand_Prepare_SingleDisk(t *testing.T) { - _, db := newTestDispatcher(t) - kv.AddInDB(db, "subnet/sn-1/state", "created") - kv.AddInDB(db, "subnet/sn-1/vpc", "vpc-1") - - cmd := StartVMCommand{ - Name: "vm-1", - Subnet: "sn-1", - IP: "10.0.0.5", - Disks: []VMDisk{{Path: "/data/root.qcow2", Dev: "sda"}}, - } - if err := cmd.Prepare(db, nil); err != nil { - t.Fatalf("Prepare a échoué : %v", err) - } - - path, err := kv.GetFromDB(db, "vm/vm-1/disk/sda") - if err != nil { - t.Fatalf("clé disk/sda absente en DB : %v", err) - } - if path != "/data/root.qcow2" { - t.Errorf("path attendu /data/root.qcow2, obtenu %q", path) - } -} - -func TestStartVMCommand_Prepare_MultiDisk(t *testing.T) { - _, db := newTestDispatcher(t) - kv.AddInDB(db, "subnet/sn-1/state", "created") - kv.AddInDB(db, "subnet/sn-1/vpc", "vpc-1") - - cmd := StartVMCommand{ - Name: "vm-2", - Subnet: "sn-1", - IP: "10.0.0.6", - Disks: []VMDisk{ - {Path: "/data/root.qcow2", Dev: "sda"}, - {Path: "/data/data.qcow2", Dev: "sdb"}, - }, - } - if err := cmd.Prepare(db, nil); err != nil { - t.Fatalf("Prepare a échoué : %v", err) - } - - for dev, want := range map[string]string{ - "sda": "/data/root.qcow2", - "sdb": "/data/data.qcow2", - } { - got, err := kv.GetFromDB(db, "vm/vm-2/disk/"+dev) - if err != nil { - t.Fatalf("clé disk/%s absente en DB : %v", dev, err) - } - if got != want { - t.Errorf("disk/%s : attendu %q, obtenu %q", dev, want, got) - } - } -} - -func TestStartVMCommand_Prepare_SlotGap(t *testing.T) { - _, db := newTestDispatcher(t) - kv.AddInDB(db, "subnet/sn-1/state", "created") - kv.AddInDB(db, "subnet/sn-1/vpc", "vpc-1") - - // sdb absent au boot — slot réservé pour hotplug - cmd := StartVMCommand{ - Name: "vm-3", - Subnet: "sn-1", - IP: "10.0.0.7", - Disks: []VMDisk{ - {Path: "/data/root.qcow2", Dev: "sda"}, - {Path: "/data/extra.qcow2", Dev: "sdc"}, - }, - } - if err := cmd.Prepare(db, nil); err != nil { - t.Fatalf("Prepare a échoué : %v", err) - } - - if _, err := kv.GetFromDB(db, "vm/vm-3/disk/sda"); err != nil { - t.Fatalf("disk/sda absent : %v", err) - } - if _, err := kv.GetFromDB(db, "vm/vm-3/disk/sdc"); err != nil { - t.Fatalf("disk/sdc absent : %v", err) - } - if _, err := kv.GetFromDB(db, "vm/vm-3/disk/sdb"); err == nil { - t.Error("disk/sdb ne devrait pas exister en DB") - } -} - -func TestStartVMCommand_Prepare_NoVolumePath(t *testing.T) { - _, db := newTestDispatcher(t) - kv.AddInDB(db, "subnet/sn-1/state", "created") - kv.AddInDB(db, "subnet/sn-1/vpc", "vpc-1") - - cmd := StartVMCommand{ - Name: "vm-4", - Subnet: "sn-1", - IP: "10.0.0.8", - Disks: []VMDisk{{Path: "/data/root.qcow2", Dev: "sda"}}, - } - if err := cmd.Prepare(db, nil); err != nil { - t.Fatalf("Prepare a échoué : %v", err) - } - - if _, err := kv.GetFromDB(db, "vm/vm-4/volume_path"); err == nil { - t.Error("volume_path ne devrait plus être écrit en DB") - } -} - -func TestStartVMCommand_Prepare_Duplicate(t *testing.T) { - _, db := newTestDispatcher(t) - kv.AddInDB(db, "vm/vm-exist/state", "started") - - cmd := StartVMCommand{ - Name: "vm-exist", - Subnet: "sn-1", - IP: "10.0.0.9", - Disks: []VMDisk{{Path: "/data/root.qcow2", Dev: "sda"}}, - } - if err := cmd.Prepare(db, nil); err == nil { - t.Error("Prepare devrait échouer si la VM existe déjà") - } -} diff --git a/internal/dispatcher/agent/vpc_commands.go b/internal/dispatcher/agent/vpc_commands.go index a129d88..c03dd77 100644 --- a/internal/dispatcher/agent/vpc_commands.go +++ b/internal/dispatcher/agent/vpc_commands.go @@ -2,7 +2,6 @@ package dispatcher import ( "fmt" - "net" "strings" "time" @@ -14,19 +13,12 @@ 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 9633733..e2f2162 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", CIDR: "10.0.0.0/16"} + cmd := CreateVPCCommand{Name: "vpc-1"} if err := cmd.Prepare(db, nil); err != nil { t.Fatalf("Prepare a échoué : %v", err) } @@ -21,32 +21,17 @@ 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", CIDR: "10.0.0.0/16"} + cmd := CreateVPCCommand{Name: "vpc-exist"} 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/ebtables/ebtables.go b/internal/ebtables/ebtables.go index 40ea0f0..31e276b 100644 --- a/internal/ebtables/ebtables.go +++ b/internal/ebtables/ebtables.go @@ -13,48 +13,46 @@ func deleteRule(args ...string) error { return exec.Command("ebtables", append([]string{"-D"}, args...)...).Run() } -func DropARPToGateway(iface, ip string) error { +func DropARPToGateway(bridge, gatewayIP string) error { if err := addRule("FORWARD", - "--out-interface", iface, + "--out-interface", bridge, "-p", "arp", "--arp-op", "Request", - "--arp-ip-dst", ip, + "--arp-ip-dst", gatewayIP, "-j", "DROP"); err != nil { return fmt.Errorf("ebtables arp rule: %w", err) } return nil } -func DropDHCP(iface, ip string) error { +func DropDHCP(bridge string) error { if err := addRule("FORWARD", - "--out-interface", iface, + "--out-interface", bridge, "-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(iface, ip string) error { +func DeleteARPToGateway(bridge, gatewayIP string) error { return deleteRule("FORWARD", - "--out-interface", iface, + "--out-interface", bridge, "-p", "arp", "--arp-op", "Request", - "--arp-ip-dst", ip, + "--arp-ip-dst", gatewayIP, "-j", "DROP") } -func DeleteDHCP(iface, ip string) error { +func DeleteDHCP(bridge string) error { return deleteRule("FORWARD", - "--out-interface", iface, + "--out-interface", bridge, "-p", "IPv4", "--ip-protocol", "udp", "--ip-source-port", "67:68", "--ip-destination-port", "67:68", - "--ip-source", ip, "-j", "DROP") } diff --git a/internal/metadata/templates/vendor-data.tmpl b/internal/metadata/templates/vendor-data.tmpl index fe0dcd8..148d6db 100644 --- a/internal/metadata/templates/vendor-data.tmpl +++ b/internal/metadata/templates/vendor-data.tmpl @@ -2,8 +2,12 @@ users: - name: syonad lock_passwd: false + gecos: alpine Cloud User + groups: [adm, wheel] + doas: + - permit nopass syonad sudo: ["ALL=(ALL) NOPASSWD:ALL"] - shell: /bin/bash + shell: /bin/ash passwd: "{{ .Password }}" ssh_authorized_keys: - - "{{ .SSHKEY }}" + - "{{ .SSHKEY }}" \ No newline at end of file diff --git a/internal/netif/gateway_linux.go b/internal/netif/gateway_linux.go deleted file mode 100644 index 6141c64..0000000 --- a/internal/netif/gateway_linux.go +++ /dev/null @@ -1,29 +0,0 @@ -//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.Gw == nil { - continue - } - if r.Dst == nil { - return r.Gw, nil - } - if ones, _ := r.Dst.Mask.Size(); ones == 0 { - 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 deleted file mode 100644 index 764867c..0000000 --- a/internal/netif/gateway_other.go +++ /dev/null @@ -1,12 +0,0 @@ -//go:build !linux - -package netif - -import ( - "fmt" - "net" -) - -func GetDefaultGateway() (net.IP, error) { - return nil, fmt.Errorf("not supported on this platform") -} diff --git a/internal/qemu/config.go b/internal/qemu/config.go deleted file mode 100644 index 9b50add..0000000 --- a/internal/qemu/config.go +++ /dev/null @@ -1,20 +0,0 @@ -package qemu - -type DiskConfig struct { - Path string - Dev string -} - -type Config struct { - Name string - TapID int - Mac string - Disks []DiskConfig - Memory int - CPUs int - UEFICodePath string - UEFIVarsPath string - SerialDir string - MonitorDir string - QMPDir string -} diff --git a/internal/qemu/start_linux.go b/internal/qemu/start_linux.go index a7869a2..6119278 100644 --- a/internal/qemu/start_linux.go +++ b/internal/qemu/start_linux.go @@ -4,13 +4,18 @@ package qemu import ( "fmt" - "os" "os/exec" - "path/filepath" - "sort" - "strings" ) +type Config struct { + Name string + TapID int + Mac string + VolumePath string + Memory int + CPUs int +} + func Start(cfg Config) error { memory := cfg.Memory if memory == 0 { @@ -22,83 +27,20 @@ func Start(cfg Config) error { cpus = 1 } - 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{ + cmd := exec.Command("qemu-system-x86_64", "-enable-kvm", "-cpu", "host", "-m", fmt.Sprintf("%d", memory), "-smp", fmt.Sprintf("%d", cpus), - "-serial", fmt.Sprintf("unix:%s,server,nowait", serialSock), - "-monitor", fmt.Sprintf("unix:%s,server,nowait", monitorSock), - "-qmp", fmt.Sprintf("unix:%s,server,nowait", qmpSock), + "-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), "-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), - ) - } - - hasScsi := false - for _, d := range cfg.Disks { - if strings.HasPrefix(d.Dev, "sd") { - hasScsi = true - break - } - } - if hasScsi { - args = append(args, "-device", "virtio-scsi-pci,id=scsi0") - } - - sorted := make([]DiskConfig, len(cfg.Disks)) - copy(sorted, cfg.Disks) - // vd* avant sd* : les disques virtio-blk bootent en premier. - // À lettre égale de type, ordre alphabétique. - sort.Slice(sorted, func(i, j int) bool { - iVirtio := strings.HasPrefix(sorted[i].Dev, "vd") - jVirtio := strings.HasPrefix(sorted[j].Dev, "vd") - if iVirtio != jVirtio { - return iVirtio - } - return sorted[i].Dev < sorted[j].Dev - }) - - for idx, d := range sorted { - bootindex := idx + 1 - if strings.HasPrefix(d.Dev, "sd") { - scsiID := int(d.Dev[2] - 'a') - args = append(args, - "-drive", fmt.Sprintf("file=%s,if=none,id=%s", d.Path, d.Dev), - "-device", fmt.Sprintf("scsi-hd,drive=%s,bus=scsi0.0,scsi-id=%d,bootindex=%d", d.Dev, scsiID, bootindex), - ) - } else { - args = append(args, - "-drive", fmt.Sprintf("file=%s,if=none,id=%s", d.Path, d.Dev), - "-device", fmt.Sprintf("virtio-blk-pci,drive=%s,bootindex=%d", d.Dev, bootindex), - ) - } - } - - 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 c28411c..782a7ee 100644 --- a/internal/qemu/start_other.go +++ b/internal/qemu/start_other.go @@ -2,9 +2,12 @@ package qemu -import ( - "errors" -) +import "errors" + +type Config struct { + Name, Mac, VolumePath string + TapID, Memory, CPUs int +} func Start(_ Config) error { return errors.New("vm: not supported on this platform") diff --git a/internal/subnet/create.go b/internal/subnet/create.go index a3faf46..5e80634 100644 --- a/internal/subnet/create.go +++ b/internal/subnet/create.go @@ -27,48 +27,46 @@ func CreateSubnet(db *badger.DB, subnetName string) error { return err } - if err := createSubnet(db, subnetName, d); err != nil { - return err - } + vxlanIface := fmt.Sprintf("vxlan-%d", d.vxlanID) - 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 { + if err := netif.CreateVethToNetns("v-"+d.subnetID+"-e", "v-"+d.subnetID+"-i", "/var/run/netns/"+d.vpc, 1500); err != nil { return fmt.Errorf("create veth: %w", 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 := netif.CreateBridge(d.bridge, 1500); err != nil { + return fmt.Errorf("create bridge: %w", err) } if err := netns.Call(d.vpc, func() error { - if err := netif.CreateBridge(d.bridge, 1500); err != nil { - return fmt.Errorf("create bridge: %w", err) - } - return netif.BridgeSetMaster(vethI, d.bridge) + return netif.CreateBridge(d.bridge, 1500) }); err != nil { - return fmt.Errorf("setup bridge in netns: %w", err) + 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) + } } if err := netns.Call(d.vpc, func() error { - for _, iface := range []string{vethI, d.bridge} { + for _, iface := range []string{"v-" + d.subnetID + "-i", d.bridge} { if err := netif.LinkSetUp(iface); err != nil { return fmt.Errorf("set up %s: %w", iface, err) } @@ -78,81 +76,31 @@ func createSubnet(db *badger.DB, subnetName string, d subnetData) error { return fmt.Errorf("set up interfaces in netns: %w", err) } - switch d.mode { - case "vxlan": - if err := netns.Call(d.vpc, func() error { - 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("configure netns: %w", err) - } - case "bridge": - if err := netns.Call(d.vpc, func() error { - 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("configure 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) } - return startDHCP(db, subnetName, d) -} + 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) + } -func setupVxlanHost(d subnetData, vethE string) error { - vxlanIface := fmt.Sprintf("vxlan-%d", d.vxlanID) + if err := ebtables.DropARPToGateway(d.bridge, d.gatewayIP.String()); err != nil { + return err + } + if err := ebtables.DropDHCP(d.bridge); err != nil { + return err + } - 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, 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 { return fmt.Errorf("generate dhcp config: %w", err) @@ -170,5 +118,6 @@ func startDHCP(db *badger.DB, subnetName string, d subnetData) error { if err := svc.Start("dnsmasq@" + conf.Name + ".service"); err != nil { return fmt.Errorf("start dnsmasq: %w", err) } - return nil + + return kv.AddInDB(db, "subnet/"+subnetName+"/state", "created") } diff --git a/internal/subnet/data.go b/internal/subnet/data.go index 0f1f62a..31f5472 100644 --- a/internal/subnet/data.go +++ b/internal/subnet/data.go @@ -11,16 +11,13 @@ 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 - defaultRoute bool + vpc string + subnetID string + bridge string + vxlanID int + localIface string + gatewayIP net.IP + cidr *net.IPNet } func loadSubnet(db *badger.DB, name string) (subnetData, error) { @@ -35,23 +32,15 @@ func loadSubnet(db *badger.DB, name string) (subnetData, error) { } d.vpc = vpc - mode, err := kv.GetFromDB(db, "subnet/"+name+"/mode") + vxlanIDStr, err := kv.GetFromDB(db, "subnet/"+name+"/vxlan_id") if err != nil { - return d, fmt.Errorf("get mode: %w", err) + return d, fmt.Errorf("get 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 + vxlanID, err := strconv.Atoi(vxlanIDStr) + if err != nil { + return d, fmt.Errorf("parse vxlan_id: %w", err) } + d.vxlanID = vxlanID localIface, err := kv.GetFromDB(db, "subnet/"+name+"/local_iface") if err != nil { @@ -59,15 +48,15 @@ func loadSubnet(db *badger.DB, name string) (subnetData, error) { } d.localIface = localIface - interfaceIPStr, err := kv.GetFromDB(db, "subnet/"+name+"/interface_ip") + gatewayIPStr, err := kv.GetFromDB(db, "subnet/"+name+"/gateway_ip") if err != nil { - return d, fmt.Errorf("get interface_ip: %w", err) + return d, fmt.Errorf("get gateway_ip: %w", err) } - interfaceIP := net.ParseIP(interfaceIPStr) - if interfaceIP == nil { - return d, fmt.Errorf("invalid interface_ip: %s", interfaceIPStr) + gatewayIP := net.ParseIP(gatewayIPStr) + if gatewayIP == nil { + return d, fmt.Errorf("invalid gateway_ip: %s", gatewayIPStr) } - d.interfaceIP = interfaceIP + d.gatewayIP = gatewayIP cidrStr, err := kv.GetFromDB(db, "subnet/"+name+"/cidr") if err != nil { @@ -79,21 +68,5 @@ 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) - } - _, vpcIPNet, err := net.ParseCIDR(vpcCIDRStr) - if err != nil { - return d, fmt.Errorf("parse vpc cidr: %w", err) - } - d.vpcCIDR = vpcIPNet - return d, nil } diff --git a/internal/subnet/delete.go b/internal/subnet/delete.go index f745eda..e7e3929 100644 --- a/internal/subnet/delete.go +++ b/internal/subnet/delete.go @@ -27,64 +27,36 @@ func DeleteSubnet(db *badger.DB, subnetName string) error { return err } - if err := stopDHCP(db, subnetName, d); err != nil { - return err - } + vxlanIface := fmt.Sprintf("vxlan-%d", d.vxlanID) - 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) } defer svc.Close() - 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 := svc.Stop("dnsmasq@" + d.vpc + "_" + d.bridge + ".service"); 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) { 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) - vethI := "v-" + d.subnetID + "-i" + if err := ebtables.DeleteARPToGateway(d.bridge, d.gatewayIP.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) + } 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 netns resources: %w", err) + return fmt.Errorf("delete bridge in netns: %w", err) } if err := netif.DeleteLink(vxlanIface); err != nil { @@ -98,23 +70,6 @@ func deleteSubnetVxlan(d subnetData) error { if err := netif.DeleteLink(d.bridge); err != nil { return fmt.Errorf("delete bridge: %w", err) } - return nil -} - -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 netns resources: %w", err) - } - - if err := netif.DeleteLink("v-" + d.subnetID + "-e"); err != nil { - return fmt.Errorf("delete veth: %w", err) - } - return nil + + return kv.AddInDB(db, "subnet/"+subnetName+"/state", "deleted") } diff --git a/internal/vm/create.go b/internal/vm/create.go index 3e0d4a7..53e2e96 100644 --- a/internal/vm/create.go +++ b/internal/vm/create.go @@ -2,9 +2,6 @@ package vm import ( "fmt" - "io" - "os" - "path/filepath" configuration "git.g3e.fr/syonad/two/internal/config/agent" "git.g3e.fr/syonad/two/internal/iptables" @@ -36,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.interfaceIP, d.metadataPort) + return iptables.AddMetadataRedirect(d.ip, d.gatewayIP, d.metadataPort) }); err != nil { return fmt.Errorf("add metadata redirect: %w", err) } @@ -44,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.interfaceIP, + BindIP: d.gatewayIP, BindPort: d.metadataPort, Password: d.password, SSHKEY: d.sshkey, @@ -52,59 +49,18 @@ func StartVM(db *badger.DB, name string, cfg *configuration.Config) error { return fmt.Errorf("start metadata: %w", err) } - qDisks := make([]qemu.DiskConfig, len(d.disks)) - for i, disk := range d.disks { - qDisks[i] = qemu.DiskConfig{Path: disk.path, Dev: disk.dev} - } - - qcfg := qemu.Config{ - Name: name, - TapID: d.tapID, - Mac: d.mac, - Disks: qDisks, - 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(qcfg) + return qemu.Start(qemu.Config{ + Name: name, + TapID: d.tapID, + Mac: d.mac, + VolumePath: d.volumePath, + Memory: d.memory, + CPUs: d.cpus, + }) }); 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 3435fb1..0563fc0 100644 --- a/internal/vm/data.go +++ b/internal/vm/data.go @@ -11,24 +11,18 @@ import ( "github.com/dgraph-io/badger/v4" ) -type diskEntry struct { - path string - dev string -} - type vmData struct { subnetName string vpcName string - interfaceIP string + gatewayIP string bridge string tapID int ip string metadataPort string mac string - disks []diskEntry + volumePath string memory int cpus int - uefi bool password string sshkey string } @@ -49,11 +43,11 @@ func loadVM(db *badger.DB, name string) (vmData, error) { } d.vpcName = vpcName - interfaceIP, err := kv.GetFromDB(db, "subnet/"+subnetName+"/interface_ip") + gatewayIP, err := kv.GetFromDB(db, "subnet/"+subnetName+"/gateway_ip") if err != nil { - return d, fmt.Errorf("get interface_ip: %w", err) + return d, fmt.Errorf("get gateway_ip: %w", err) } - d.interfaceIP = interfaceIP + d.gatewayIP = gatewayIP tapIDStr, err := kv.GetFromDB(db, "vm/"+name+"/tap_id") if err != nil { @@ -87,18 +81,11 @@ func loadVM(db *badger.DB, name string) (vmData, error) { } d.mac = mac - diskEntries, err := kv.ListByPrefix(db, "vm/"+name+"/disk/") + volumePath, err := kv.GetFromDB(db, "vm/"+name+"/volume_path") if err != nil { - return d, fmt.Errorf("list disks: %w", err) - } - if len(diskEntries) == 0 { - return d, fmt.Errorf("no disks found for vm %q", name) - } - diskPrefix := "vm/" + name + "/disk/" - for key, path := range diskEntries { - dev := strings.TrimPrefix(key, diskPrefix) - d.disks = append(d.disks, diskEntry{path: path, dev: dev}) + return d, fmt.Errorf("get volume_path: %w", err) } + d.volumePath = volumePath memoryStr, err := kv.GetFromDB(db, "vm/"+name+"/memory") if err != nil { @@ -118,9 +105,6 @@ 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 3d808e6..5030339 100644 --- a/internal/vm/delete.go +++ b/internal/vm/delete.go @@ -2,8 +2,6 @@ package vm import ( "fmt" - "os" - "path/filepath" "time" configuration "git.g3e.fr/syonad/two/internal/config/agent" @@ -31,23 +29,30 @@ func StopVM(db *badger.DB, name string, cfg *configuration.Config) error { return err } - socketPath := filepath.Join(cfg.QEMU.QMPDir, name+".sock") + socketPath := fmt.Sprintf("/tmp/%s.qmp-sock", name) - if _, err := os.Stat(socketPath); err == nil { - // socket présent : tenter l'arrêt gracieux - if _, err := qmp.Send(socketPath, []string{`{"execute":"system_powerdown"}`}); err == nil { - waitQMPDead(socketPath, - time.Duration(cfg.Dispatcher.TimeoutSeconds)*time.Second, - time.Duration(cfg.Dispatcher.PollSeconds)*time.Second, - ) - } - // connexion QMP échouée : QEMU déjà mort + if _, err := qmp.Send(socketPath, []string{`{"execute":"system_powerdown"}`}); err != nil { + return fmt.Errorf("qmp system_powerdown: %w", err) } - // socket absent ou QEMU déjà arrêté : cleanup direct + // attendre l'arrêt effectif de la VM ; forcer via quit après timeout + timeout := time.After(time.Duration(cfg.Dispatcher.TimeoutSeconds) * time.Second) + poll := time.Duration(cfg.Dispatcher.PollSeconds) * time.Second + stopped := false + for !stopped { + select { + case <-timeout: + qmp.Send(socketPath, []string{`{"execute":"quit"}`}) + stopped = true + case <-time.After(poll): + if _, err := qmp.Send(socketPath, nil); err != nil { + stopped = true + } + } + } if err := netns.Call(d.vpcName, func() error { - return iptables.DeleteMetadataRedirect(d.ip, d.interfaceIP, d.metadataPort) + return iptables.DeleteMetadataRedirect(d.ip, d.gatewayIP, d.metadataPort) }); err != nil { return fmt.Errorf("delete metadata redirect: %w", err) } @@ -60,25 +65,5 @@ 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") } - -func waitQMPDead(socketPath string, timeout, poll time.Duration) { - timer := time.After(timeout) - for { - select { - case <-timer: - qmp.Send(socketPath, []string{`{"execute":"quit"}`}) - return - case <-time.After(poll): - if _, err := qmp.Send(socketPath, nil); err != nil { - return - } - } - } -} diff --git a/pkg/db/kv/admin_server.go b/pkg/db/kv/admin_server.go deleted file mode 100644 index 1216244..0000000 --- a/pkg/db/kv/admin_server.go +++ /dev/null @@ -1,52 +0,0 @@ -package kv - -import ( - "fmt" - "log/slog" - "net/http" - "sort" - - "github.com/dgraph-io/badger/v4" -) - -type AdminServer struct { - db *badger.DB - logger *slog.Logger -} - -func NewAdminServer(db *badger.DB, logger *slog.Logger) *AdminServer { - return &AdminServer{db: db, logger: logger} -} - -func (s *AdminServer) Start(address string) { - mux := http.NewServeMux() - mux.HandleFunc("/db", s.dbHandler) - s.logger.Info("admin server listening", "address", address) - if err := http.ListenAndServe(address, mux); err != nil { - s.logger.Error("admin server stopped", "error", err) - } -} - -func (s *AdminServer) dbHandler(w http.ResponseWriter, r *http.Request) { - if r.Method != http.MethodGet { - http.Error(w, "method not allowed", http.StatusMethodNotAllowed) - return - } - - entries, err := ListByPrefix(s.db, r.URL.Query().Get("prefix")) - if err != nil { - http.Error(w, "db error: "+err.Error(), http.StatusInternalServerError) - return - } - - keys := make([]string, 0, len(entries)) - for k := range entries { - keys = append(keys, k) - } - sort.Strings(keys) - - w.Header().Set("Content-Type", "text/plain; charset=utf-8") - for _, k := range keys { - fmt.Fprintf(w, "%s=%s\n", k, entries[k]) - } -} diff --git a/pkg/db/kv/init.go b/pkg/db/kv/init.go index e250096..0ee2374 100644 --- a/pkg/db/kv/init.go +++ b/pkg/db/kv/init.go @@ -17,8 +17,7 @@ func InitDB(conf Config, readonly bool) *badger.DB { opts.NumLevelZeroTablesStall = 2 db, err := badger.Open(opts) if err != nil { - log.Printf("kv.InitDB (readonly=%v, path=%s): %v", readonly, conf.Path, err) - panic(err) + log.Fatalf("kv.InitDB (readonly=%v, path=%s): %v", readonly, conf.Path, err) } return db }