f-28: bridge: first split bridge vxlan

Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>

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 {
+	switch d.mode {
-		return fmt.Errorf("create bridge: %w", err)
+	case "vxlan":
-	}
+		if err := setupVxlanHost(d, vethE); err != nil {
-
+			return 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)
 		}
+	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 {
+	switch d.mode {
-		return netif.AddrAdd(d.bridge, d.gatewayIP)
+	case "vxlan":
-	}); err != nil {
+		if err := netns.Call(d.vpc, func() error {
-		return fmt.Errorf("add addr to bridge in netns: %w", err)
+			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 {
+	applyEbtables := func() error {
-		return netif.RouteAdd(d.bridge, d.cidr)
+		if err := ebtables.DropARPToGateway(d.bridge, d.gatewayIP.String()); err != nil {
-	}); err != nil {
+			return err
-		return fmt.Errorf("add route in netns: %w", 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 startDHCP(db, subnetName, d)
-		return err
+}
-	}
-	if err := ebtables.DropDHCP(d.bridge); err != nil {
-		return err
-	}
 
+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 nil
-	return kv.AddInDB(db, "subnet/"+subnetName+"/state", "created")
 }

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)
+	d.mode = mode
-	if err != nil {
+
-		return d, fmt.Errorf("parse vxlan_id: %w", err)
+	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 {

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 nil
-	return kv.AddInDB(db, "subnet/"+subnetName+"/state", "deleted")
+}
+
+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
 }