f-41: l3vni: routage des VPC sorti de vpc dans son propre paquet #41
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
43f8f4585e
commit
42d763f15e
18 changed files with 80 additions and 66 deletions
|
|
@ -39,6 +39,13 @@ Paquets
|
|||
- migrations idempotentes jouées au démarrage de l'agent
|
||||
* - ``internal/vpc``, ``internal/subnet``
|
||||
- création et suppression bas niveau (netns + netif)
|
||||
* - ``internal/l3vni``
|
||||
- routage d'une VPC par L3VNI : VRF, L3VNI, transit, configuration FRR, export des routes
|
||||
``/24`` et ``/32``
|
||||
* - ``internal/frr``
|
||||
- génération des commandes FRR, seul point d'appel à ``vtysh``
|
||||
* - ``internal/sysctl``
|
||||
- écriture sous ``/proc/sys``, dans un netns si besoin
|
||||
* - ``internal/netns``
|
||||
- network namespaces : create/enter/delete/call
|
||||
* - ``internal/netif``
|
||||
|
|
|
|||
|
|
@ -8,7 +8,7 @@ import (
|
|||
"strings"
|
||||
|
||||
dispatcher "git.g3e.fr/syonad/two/internal/dispatcher/agent"
|
||||
"git.g3e.fr/syonad/two/internal/vpc"
|
||||
"git.g3e.fr/syonad/two/internal/l3vni"
|
||||
"git.g3e.fr/syonad/two/pkg/db/kv"
|
||||
)
|
||||
|
||||
|
|
@ -82,7 +82,7 @@ func (s *Server) postVpc(w http.ResponseWriter, r *http.Request) {
|
|||
}
|
||||
cmd := dispatcher.CreateVPCCommand{Name: req.Name, CIDR: req.CIDR}
|
||||
if req.L3VNI != nil {
|
||||
if err := vpc.ValidL3VNI(*req.L3VNI); err != nil {
|
||||
if err := l3vni.Valid(*req.L3VNI); err != nil {
|
||||
w.WriteHeader(http.StatusBadRequest)
|
||||
json.NewEncoder(w).Encode(ErrorResponse{Error: err.Error()})
|
||||
return
|
||||
|
|
|
|||
|
|
@ -8,6 +8,7 @@ import (
|
|||
"time"
|
||||
|
||||
configuration "git.g3e.fr/syonad/two/internal/config/agent"
|
||||
"git.g3e.fr/syonad/two/internal/l3vni"
|
||||
"git.g3e.fr/syonad/two/internal/state"
|
||||
"git.g3e.fr/syonad/two/internal/vpc"
|
||||
"git.g3e.fr/syonad/two/pkg/db/kv"
|
||||
|
|
@ -46,7 +47,7 @@ func (c CreateVPCCommand) Prepare(db *badger.DB, cfg *configuration.Config) erro
|
|||
}
|
||||
|
||||
func (c CreateVPCCommand) checkL3VNI(db *badger.DB, cfg *configuration.Config) error {
|
||||
if err := vpc.ValidL3VNI(c.L3VNI); err != nil {
|
||||
if err := l3vni.Valid(c.L3VNI); err != nil {
|
||||
return err
|
||||
}
|
||||
if cfg == nil || !cfg.BGP.Enabled() {
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
package vpc
|
||||
package l3vni
|
||||
|
||||
import (
|
||||
"net"
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package vpc
|
||||
package l3vni
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
|
@ -35,7 +35,7 @@ func loadL3(db *badger.DB, name, id string) (l3VPC, bool, error) {
|
|||
if err != nil {
|
||||
return l3VPC{}, false, fmt.Errorf("vpc %q: invalid l3vni %q", name, raw)
|
||||
}
|
||||
if err := ValidL3VNI(uint32(vni)); err != nil {
|
||||
if err := Valid(uint32(vni)); err != nil {
|
||||
return l3VPC{}, false, fmt.Errorf("vpc %q: %w", name, err)
|
||||
}
|
||||
cidr, err := kv.GetFromDB(db, "vpc/"+name+"/cidr")
|
||||
|
|
@ -138,6 +138,22 @@ func deleteL3(h host, cfg *configuration.Config, v l3VPC) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func Create(db *badger.DB, vpcName string, cfg *configuration.Config) error {
|
||||
v, ok, err := loadRouted(db, vpcName)
|
||||
if err != nil || !ok {
|
||||
return err
|
||||
}
|
||||
return createL3(newSystem(), cfg, v)
|
||||
}
|
||||
|
||||
func Delete(db *badger.DB, vpcName string, cfg *configuration.Config) error {
|
||||
v, ok, err := loadRouted(db, vpcName)
|
||||
if err != nil || !ok {
|
||||
return err
|
||||
}
|
||||
return deleteL3(newSystem(), cfg, v)
|
||||
}
|
||||
|
||||
type Routing struct {
|
||||
VNI uint32
|
||||
Supernet *net.IPNet
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package vpc
|
||||
package l3vni
|
||||
|
||||
import (
|
||||
"errors"
|
||||
|
|
@ -1,10 +1,10 @@
|
|||
package vpc
|
||||
package l3vni
|
||||
|
||||
import "fmt"
|
||||
|
||||
const maxL3VNI = 1<<24 - 1
|
||||
|
||||
func ValidL3VNI(id uint32) error {
|
||||
func Valid(id uint32) error {
|
||||
if id == 0 || id > maxL3VNI {
|
||||
return fmt.Errorf("l3vni %d does not fit in 24 bits (1-%d)", id, maxL3VNI)
|
||||
}
|
||||
29
internal/l3vni/l3vni_test.go
Normal file
29
internal/l3vni/l3vni_test.go
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
package l3vni
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestValid_AcceptsEvery24BitValueOutsideTheKernelTables(t *testing.T) {
|
||||
for _, id := range []uint32{1, 252, 256, 4001, 16777215} {
|
||||
if err := Valid(id); err != nil {
|
||||
t.Errorf("Valid(%d) = %v", id, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestValid_RejectsOutOfRangeAndReservedTables(t *testing.T) {
|
||||
cases := map[uint32]string{
|
||||
0: "does not fit in 24 bits",
|
||||
16777216: "does not fit in 24 bits",
|
||||
253: "is reserved",
|
||||
254: "is reserved",
|
||||
255: "is reserved",
|
||||
}
|
||||
for id, want := range cases {
|
||||
if err := Valid(id); err == nil || !strings.Contains(err.Error(), want) {
|
||||
t.Errorf("Valid(%d) = %v, attendu %q", id, err, want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package vpc
|
||||
package l3vni
|
||||
|
||||
import (
|
||||
"fmt"
|
||||
|
|
@ -1,4 +1,4 @@
|
|||
package vpc
|
||||
package l3vni
|
||||
|
||||
import (
|
||||
"errors"
|
||||
|
|
@ -8,10 +8,10 @@ import (
|
|||
"git.g3e.fr/syonad/two/internal/dhcp"
|
||||
"git.g3e.fr/syonad/two/internal/dhcpbackend"
|
||||
"git.g3e.fr/syonad/two/internal/ebtables"
|
||||
"git.g3e.fr/syonad/two/internal/l3vni"
|
||||
"git.g3e.fr/syonad/two/internal/netif"
|
||||
"git.g3e.fr/syonad/two/internal/netns"
|
||||
"git.g3e.fr/syonad/two/internal/state"
|
||||
"git.g3e.fr/syonad/two/internal/vpc"
|
||||
|
||||
"github.com/dgraph-io/badger/v4"
|
||||
)
|
||||
|
|
@ -40,7 +40,7 @@ func CreateSubnet(db *badger.DB, subnetName string, cfg *configuration.Config) e
|
|||
}
|
||||
|
||||
if d.mode == ModeVxlan {
|
||||
if err := vpc.ExportRoute(db, d.vpc, d.cidr); err != nil {
|
||||
if err := l3vni.ExportRoute(db, d.vpc, d.cidr); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@ import (
|
|||
configuration "git.g3e.fr/syonad/two/internal/config/agent"
|
||||
"git.g3e.fr/syonad/two/internal/dhcpbackend"
|
||||
"git.g3e.fr/syonad/two/internal/ebtables"
|
||||
"git.g3e.fr/syonad/two/internal/l3vni"
|
||||
"git.g3e.fr/syonad/two/internal/netif"
|
||||
"git.g3e.fr/syonad/two/internal/netns"
|
||||
"git.g3e.fr/syonad/two/internal/state"
|
||||
"git.g3e.fr/syonad/two/internal/vpc"
|
||||
"git.g3e.fr/syonad/two/pkg/db/kv"
|
||||
|
||||
"github.com/dgraph-io/badger/v4"
|
||||
|
|
@ -35,7 +35,7 @@ func DeleteSubnet(db *badger.DB, subnetName string, cfg *configuration.Config) e
|
|||
}
|
||||
|
||||
if d.mode == ModeVxlan {
|
||||
if err := vpc.WithdrawRoute(db, d.vpc, d.cidr); err != nil {
|
||||
if err := l3vni.WithdrawRoute(db, d.vpc, d.cidr); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@ import (
|
|||
configuration "git.g3e.fr/syonad/two/internal/config/agent"
|
||||
"git.g3e.fr/syonad/two/internal/dhcpbackend"
|
||||
"git.g3e.fr/syonad/two/internal/iptables"
|
||||
"git.g3e.fr/syonad/two/internal/l3vni"
|
||||
"git.g3e.fr/syonad/two/internal/metadata"
|
||||
"git.g3e.fr/syonad/two/internal/netif"
|
||||
"git.g3e.fr/syonad/two/internal/netns"
|
||||
"git.g3e.fr/syonad/two/internal/qemu"
|
||||
"git.g3e.fr/syonad/two/internal/state"
|
||||
"git.g3e.fr/syonad/two/internal/vpc"
|
||||
|
||||
"github.com/dgraph-io/badger/v4"
|
||||
)
|
||||
|
|
@ -112,7 +112,7 @@ func StartVM(db *badger.DB, name string, cfg *configuration.Config) error {
|
|||
return fmt.Errorf("start qemu: %w", err)
|
||||
}
|
||||
|
||||
if err := applyHostRoutes(db, d, vpc.ExportRoute); err != nil {
|
||||
if err := applyHostRoutes(db, d, l3vni.ExportRoute); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -9,12 +9,12 @@ import (
|
|||
configuration "git.g3e.fr/syonad/two/internal/config/agent"
|
||||
"git.g3e.fr/syonad/two/internal/dhcpbackend"
|
||||
"git.g3e.fr/syonad/two/internal/iptables"
|
||||
"git.g3e.fr/syonad/two/internal/l3vni"
|
||||
"git.g3e.fr/syonad/two/internal/metadata"
|
||||
"git.g3e.fr/syonad/two/internal/netif"
|
||||
"git.g3e.fr/syonad/two/internal/netns"
|
||||
"git.g3e.fr/syonad/two/internal/qmp"
|
||||
"git.g3e.fr/syonad/two/internal/state"
|
||||
"git.g3e.fr/syonad/two/internal/vpc"
|
||||
|
||||
"github.com/dgraph-io/badger/v4"
|
||||
)
|
||||
|
|
@ -39,7 +39,7 @@ func StopVM(db *badger.DB, name string, cfg *configuration.Config) error {
|
|||
return err
|
||||
}
|
||||
|
||||
if err := applyHostRoutes(db, d, vpc.WithdrawRoute); err != nil {
|
||||
if err := applyHostRoutes(db, d, l3vni.WithdrawRoute); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import (
|
|||
"strings"
|
||||
|
||||
configuration "git.g3e.fr/syonad/two/internal/config/agent"
|
||||
"git.g3e.fr/syonad/two/internal/l3vni"
|
||||
"git.g3e.fr/syonad/two/internal/netif"
|
||||
"git.g3e.fr/syonad/two/internal/netns"
|
||||
"git.g3e.fr/syonad/two/internal/state"
|
||||
|
|
@ -49,15 +50,9 @@ func CreateVPC(db *badger.DB, name string, cfg *configuration.Config) error {
|
|||
}); err != nil {
|
||||
return err
|
||||
}
|
||||
l3, ok, err := loadL3(db, name, vpcID)
|
||||
if err != nil {
|
||||
if err := l3vni.Create(db, name, cfg); err != nil {
|
||||
return err
|
||||
}
|
||||
if ok {
|
||||
if err := createL3(newSystem(), cfg, l3); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
return state.Set(db, "vpc/"+name, state.Running)
|
||||
}
|
||||
return nil
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@ import (
|
|||
"strings"
|
||||
|
||||
configuration "git.g3e.fr/syonad/two/internal/config/agent"
|
||||
"git.g3e.fr/syonad/two/internal/l3vni"
|
||||
"git.g3e.fr/syonad/two/internal/netif"
|
||||
"git.g3e.fr/syonad/two/internal/netns"
|
||||
"git.g3e.fr/syonad/two/internal/state"
|
||||
|
|
@ -17,15 +18,9 @@ func DeleteVPC(db *badger.DB, name string, cfg *configuration.Config) error {
|
|||
} else if current == state.Deleting {
|
||||
vpcID := strings.SplitN(name, "-", 2)[1]
|
||||
|
||||
l3, ok, err := loadL3(db, name, vpcID)
|
||||
if err != nil {
|
||||
if err := l3vni.Delete(db, name, cfg); err != nil {
|
||||
return err
|
||||
}
|
||||
if ok {
|
||||
if err := deleteL3(newSystem(), cfg, l3); err != nil {
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
if err := netif.DeleteLink("vp-" + vpcID + "-e"); err != nil {
|
||||
return err
|
||||
|
|
|
|||
|
|
@ -1,29 +0,0 @@
|
|||
package vpc
|
||||
|
||||
import (
|
||||
"strings"
|
||||
"testing"
|
||||
)
|
||||
|
||||
func TestValidL3VNI_AcceptsEvery24BitValueOutsideTheKernelTables(t *testing.T) {
|
||||
for _, id := range []uint32{1, 252, 256, 4001, 16777215} {
|
||||
if err := ValidL3VNI(id); err != nil {
|
||||
t.Errorf("ValidL3VNI(%d) = %v", id, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestValidL3VNI_RejectsOutOfRangeAndReservedTables(t *testing.T) {
|
||||
cases := map[uint32]string{
|
||||
0: "does not fit in 24 bits",
|
||||
16777216: "does not fit in 24 bits",
|
||||
253: "is reserved",
|
||||
254: "is reserved",
|
||||
255: "is reserved",
|
||||
}
|
||||
for id, want := range cases {
|
||||
if err := ValidL3VNI(id); err == nil || !strings.Contains(err.Error(), want) {
|
||||
t.Errorf("ValidL3VNI(%d) = %v, attendu %q", id, err, want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -8,10 +8,10 @@ import (
|
|||
|
||||
configuration "git.g3e.fr/syonad/two/internal/config/agent"
|
||||
"git.g3e.fr/syonad/two/internal/frr"
|
||||
"git.g3e.fr/syonad/two/internal/l3vni"
|
||||
"git.g3e.fr/syonad/two/internal/netif"
|
||||
"git.g3e.fr/syonad/two/internal/netns"
|
||||
"git.g3e.fr/syonad/two/internal/state"
|
||||
"git.g3e.fr/syonad/two/internal/vpc"
|
||||
"git.g3e.fr/syonad/two/internal/watchdog/notify"
|
||||
"git.g3e.fr/syonad/two/pkg/db/kv"
|
||||
|
||||
|
|
@ -91,7 +91,7 @@ func CheckL3VPCs(db *badger.DB, cfg *configuration.Config, p l3Probe, n notify.N
|
|||
if st, err := state.Get(db, prefixVPC+name); err != nil || st != state.Running {
|
||||
continue
|
||||
}
|
||||
r, ok, err := vpc.LoadRouting(db, name)
|
||||
r, ok, err := l3vni.LoadRouting(db, name)
|
||||
if err != nil {
|
||||
n.Notify(kindVPC, name, err.Error())
|
||||
continue
|
||||
|
|
@ -117,7 +117,7 @@ func expectedRouterMAC(cfg *configuration.Config, p l3Probe, n notify.Notifier)
|
|||
n.Notify(kindBGP, "vtep", fmt.Sprintf("vtep address unreadable on %s: %v", cfg.DefaultInterface, err))
|
||||
return "unknown"
|
||||
}
|
||||
mac, err := vpc.RouterMAC(vtep)
|
||||
mac, err := l3vni.RouterMAC(vtep)
|
||||
if err != nil {
|
||||
n.Notify(kindBGP, "vtep", err.Error())
|
||||
return "unknown"
|
||||
|
|
@ -125,7 +125,7 @@ func expectedRouterMAC(cfg *configuration.Config, p l3Probe, n notify.Notifier)
|
|||
return mac.String()
|
||||
}
|
||||
|
||||
func checkL3VPC(db *badger.DB, name string, r vpc.Routing, rmac string, p l3Probe, n notify.Notifier) {
|
||||
func checkL3VPC(db *badger.DB, name string, r l3vni.Routing, rmac string, p l3Probe, n notify.Notifier) {
|
||||
for _, iface := range []string{r.VRF, r.Bridge, r.Vxlan, r.VethHost} {
|
||||
if problem := p.LinkProblem("", iface); problem != "" {
|
||||
n.Notify(kindVPC, name, problem)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue