syonad/two
2
0
Fork 0
Code Issues 6 Pull requests 1 Projects Releases 9 Packages Wiki Activity Actions

f-25: code: move load data to dedicated function

Browse source 
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
GnomeZworc 2026-04-26 17:57:16 +02:00
commit cc9998028d
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632
6 changed files with 222 additions and 208 deletions
Download patch file Download diff file Expand all files Collapse all files

97
internal/subnet/create.go
View file

@ -2,9 +2,6 @@ package subnet
import (
"fmt"
"net"
"strconv"
"strings"
"git.g3e.fr/syonad/two/internal/dhcp"
"git.g3e.fr/syonad/two/internal/ebtables"
@ -25,94 +22,51 @@ func CreateSubnet(db *badger.DB, subnetName string) error {
return nil
}
// lecture des paramètres depuis la DB
vpcName, err := kv.GetFromDB(db, "subnet/"+subnetName+"/vpc")
d, err := loadSubnet(db, subnetName)
if err != nil {
return fmt.Errorf("get vpc: %w", err)
return err
}
vxlanIDStr, err := kv.GetFromDB(db, "subnet/"+subnetName+"/vxlan_id")
if err != nil {
return fmt.Errorf("get vxlan_id: %w", err)
}
vxlanID, err := strconv.Atoi(vxlanIDStr)
if err != nil {
return fmt.Errorf("parse vxlan_id: %w", err)
}
vxlanIface := fmt.Sprintf("vxlan-%d", d.vxlanID)
localIface, err := kv.GetFromDB(db, "subnet/"+subnetName+"/local_iface")
if err != nil {
return fmt.Errorf("get local_iface: %w", err)
}
gatewayIPStr, err := kv.GetFromDB(db, "subnet/"+subnetName+"/gateway_ip")
if err != nil {
return fmt.Errorf("get gateway_ip: %w", err)
}
gatewayIP := net.ParseIP(gatewayIPStr)
if gatewayIP == nil {
return fmt.Errorf("invalid gateway_ip: %s", gatewayIPStr)
}
cidr, err := kv.GetFromDB(db, "subnet/"+subnetName+"/cidr")
if err != nil {
return fmt.Errorf("get cidr: %w", err)
}
_, subnet, err := net.ParseCIDR(cidr)
if err != nil {
return fmt.Errorf("parse cidr: %w", err)
}
// subnet_id = partie après le premier '-' (ex: "sn-00001" -> "00001")
subnetID := strings.SplitN(subnetName, "-", 2)[1]
bridge := "br-" + subnetID
vxlanIface := fmt.Sprintf("vxlan-%d", vxlanID)
// veth pair
if err := netif.CreateVethToNetns("v-"+subnetID+"-e", "v-"+subnetID+"-i", "/var/run/netns/"+vpcName, 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)
}
// bridge dans le root netns
if err := netif.CreateBridge(bridge, 1500); err != nil {
if err := netif.CreateBridge(d.bridge, 1500); err != nil {
return fmt.Errorf("create bridge: %w", err)
}
// bridge dans le netns VPC
if err := netns.Call(vpcName, func() error {
return netif.CreateBridge(bridge, 1500)
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)
}
// vxlan
if err := netif.CreateVxlan(vxlanIface, vxlanID, localIface, 1500); err != nil {
if err := netif.CreateVxlan(vxlanIface, d.vxlanID, d.localIface, 1500); err != nil {
return fmt.Errorf("create vxlan: %w", err)
}
// ajout des interfaces dans les bridges
if err := netif.BridgeSetMaster("v-"+subnetID+"-e", bridge); err != nil {
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(vpcName, func() error {
return netif.BridgeSetMaster("v-"+subnetID+"-i", bridge)
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, bridge); err != nil {
if err := netif.BridgeSetMaster(vxlanIface, d.bridge); err != nil {
return fmt.Errorf("add vxlan to bridge: %w", err)
}
// montée des interfaces dans le root netns
for _, iface := range []string{"v-" + subnetID + "-e", vxlanIface, bridge} {
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)
}
}
// montée des interfaces dans le netns VPC
if err := netns.Call(vpcName, func() error {
for _, iface := range []string{"v-" + subnetID + "-i", bridge} {
if err := netns.Call(d.vpc, func() error {
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)
}
@ -122,32 +76,29 @@ func CreateSubnet(db *badger.DB, subnetName string) error {
return fmt.Errorf("set up interfaces in netns: %w", err)
}
// IP gateway (/32) sur le bridge interne
if err := netns.Call(vpcName, func() error {
return netif.AddrAdd(bridge, gatewayIP)
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)
}
// route subnet (scope link) dans le netns VPC
if err := netns.Call(vpcName, func() error {
return netif.RouteAdd(bridge, subnet)
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)
}
if err := ebtables.DropARPToGateway(bridge, gatewayIP.String()); err != nil {
if err := ebtables.DropARPToGateway(d.bridge, d.gatewayIP.String()); err != nil {
return err
}
if err := ebtables.DropDHCP(bridge); err != nil {
if err := ebtables.DropDHCP(d.bridge); err != nil {
return err
}
// génération de la config dnsmasq et démarrage du service
conf := dhcp.Config{
Network: subnet,
Gateway: gatewayIP,
Name: vpcName + "_" + bridge,
Network: d.cidr,
Gateway: d.gatewayIP,
Name: d.vpc + "_" + d.bridge,
ConfDir: "/etc/dnsmasq.d",
}
if _, err := dhcp.GenerateConfig(conf); err != nil {