Compare commits
5 commits
2e14f6a543
...
eb89a2220c
| Author | SHA1 | Date | |
|---|---|---|---|
|
eb89a2220c |
|||
|
b530428de2 |
|||
|
3aa8119335 |
|||
|
588a9ee665 |
|||
|
6b853ded48 |
22 changed files with 184 additions and 71 deletions
|
|
@ -321,11 +321,11 @@ components:
|
|||
type: integer
|
||||
format: int32
|
||||
minimum: 1
|
||||
maximum: 16777215
|
||||
maximum: 65535
|
||||
description: >-
|
||||
Optional. L3VNI of the VPC, used for inter-subnet routing between hypervisors
|
||||
(symmetric IRB). Also the id of the routing table of the VPC VRF, so 253-255 are
|
||||
rejected. Requires the bgp section in the agent configuration, and must not be used
|
||||
rejected, and the number of the route distinguisher <vtep>:<l3vni>, which holds 16 bits. Requires the bgp section in the agent configuration, and must not be used
|
||||
by another VPC of the agent. Absent: the VPC has no L3VNI.
|
||||
example: 4001
|
||||
|
||||
|
|
|
|||
|
|
@ -31,11 +31,14 @@ const shutdownTimeout = 20 * time.Second
|
|||
func main() {
|
||||
confFile := flag.String("config", "/etc/two/agent.yml", "config file path")
|
||||
flag.Parse()
|
||||
os.Exit(run(*confFile))
|
||||
}
|
||||
|
||||
cfg, err := configuration.LoadConfig(*confFile)
|
||||
func run(confFile string) int {
|
||||
cfg, err := configuration.LoadConfig(confFile)
|
||||
if err != nil {
|
||||
slog.Error("failed to load config", "error", err)
|
||||
return
|
||||
return 1
|
||||
}
|
||||
|
||||
log := logger.New(cfg.Logger.Level, cfg.Logger.Debug)
|
||||
|
|
@ -52,18 +55,18 @@ func main() {
|
|||
// d'états, et des ressources transitoires orphelines d'un arrêt précédent.
|
||||
if err := migration.MigrateStates(db, log.With(slog.String("component", "migration"))); err != nil {
|
||||
log.Error("failed to migrate states", "error", err)
|
||||
return
|
||||
return 1
|
||||
}
|
||||
|
||||
if err := migration.MigrateVMNICs(db, log.With(slog.String("component", "migration"))); err != nil {
|
||||
log.Error("vm nic migration failed", "error", err)
|
||||
return
|
||||
return 1
|
||||
}
|
||||
|
||||
if cfg.BGP.Enabled() {
|
||||
if err := applyBGPBase(cfg, frr.NewClient()); err != nil {
|
||||
log.Error("failed to apply the bgp base configuration", "error", err)
|
||||
return
|
||||
return 1
|
||||
}
|
||||
log.Info("bgp base configuration applied", "asn", cfg.BGP.ASN, "route_reflectors", cfg.BGP.RouteReflectors)
|
||||
}
|
||||
|
|
@ -118,6 +121,7 @@ func main() {
|
|||
servers["admin"] = adminSrv
|
||||
}
|
||||
closeDB = shutdown(log, q, servers, shutdownTimeout)
|
||||
return 0
|
||||
}
|
||||
|
||||
type baseApplier interface {
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@ import (
|
|||
"errors"
|
||||
"io"
|
||||
"log/slog"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"sync/atomic"
|
||||
"testing"
|
||||
|
|
@ -117,3 +119,27 @@ func TestApplyBGPBase_RefusesAnInvalidSectionBeforeTouchingFRR(t *testing.T) {
|
|||
t.Error("ApplyBase appelé avec une section bgp invalide")
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunExitsNonZeroWhenTheConfigCannotBeLoaded(t *testing.T) {
|
||||
conf := filepath.Join(t.TempDir(), "agent.yml")
|
||||
if err := os.WriteFile(conf, []byte("bgp: [non: valide\n"), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if code := run(conf); code != 1 {
|
||||
t.Errorf("code de sortie %d, 1 attendu", code)
|
||||
}
|
||||
}
|
||||
|
||||
func TestRunExitsNonZeroWhenTheBGPBaseCannotBeApplied(t *testing.T) {
|
||||
dir := t.TempDir()
|
||||
conf := filepath.Join(dir, "agent.yml")
|
||||
yml := "database:\n path: " + filepath.Join(dir, "db") + "\n" +
|
||||
"default_interface: two-test-absent0\n" +
|
||||
"bgp:\n asn: 64600\n route_reflectors: [10.255.255.1]\n"
|
||||
if err := os.WriteFile(conf, []byte(yml), 0o600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if code := run(conf); code != 1 {
|
||||
t.Errorf("code de sortie %d, 1 attendu", code)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -149,7 +149,10 @@ livré le 2026-10-11 un E5-2670 de 2012, x86-64-v2, sur lequel Rocky 10 ne déma
|
|||
``prepare`` refuse donc un serveur sans x86-64-v3 — dans une ``session``, il est aussitôt
|
||||
supprimé. La zone n'est pas imposée : ``plan`` et ``up`` prennent la première zone de
|
||||
``LAB_ZONES`` (par défaut toutes les zones Elastic Metal) où l'offre est en stock, ``SCW_DEFAULT_ZONE``
|
||||
passant en tête ; ``status`` et ``down`` couvrent toutes ces zones.
|
||||
passant en tête ; ``status`` et ``down`` couvrent toutes ces zones. Une zone dont la liste échoue
|
||||
est signalée sans masquer les autres : ``status`` affiche ce qui a répondu, ``down`` supprime les
|
||||
serveurs listés, et tous deux sortent en erreur ; ``up`` refuse de créer tant qu'une zone reste
|
||||
inconnue.
|
||||
|
||||
``session`` est la forme normale d'usage : le serveur est supprimé à la fin, que la commande
|
||||
réussisse, échoue, ou que la session soit interrompue (Ctrl-C, ``TERM``, fermeture du terminal).
|
||||
|
|
|
|||
|
|
@ -50,7 +50,8 @@ Avec une section ``bgp`` dans la configuration, il contrôle aussi le plan de co
|
|||
le propriétaire n'existe plus — ni ``running``, ni en ``creating``, ``deleting`` ou ``error`` —
|
||||
est signalée comme un **trou noir** : l'annonce attire du trafic que plus rien ne reçoit.
|
||||
|
||||
Un VPC routé alors que la section ``bgp`` a disparu de la configuration est signalé lui aussi.
|
||||
Un VPC routé alors que la section ``bgp`` a disparu de la configuration est signalé lui aussi. Il
|
||||
reste supprimable : le démontage lit l'AS de son instance dans la configuration courante de FRR.
|
||||
|
||||
.. note::
|
||||
|
||||
|
|
|
|||
|
|
@ -280,6 +280,7 @@ func TestPostVpc_RejectsAnInvalidL3VNIAsABadRequest(t *testing.T) {
|
|||
for _, body := range []string{
|
||||
`{"name":"vp-1","cidr":"10.0.0.0/16","l3vni":0}`,
|
||||
`{"name":"vp-1","cidr":"10.0.0.0/16","l3vni":255}`,
|
||||
`{"name":"vp-1","cidr":"10.0.0.0/16","l3vni":65536}`,
|
||||
`{"name":"vp-1","cidr":"10.0.0.0/16","l3vni":16777216}`,
|
||||
`{"name":"vp-1","cidr":"10.0.0.0/16","l3vni":-1}`,
|
||||
} {
|
||||
|
|
|
|||
|
|
@ -133,7 +133,7 @@ func (c DeleteVPCCommand) Execute(db *badger.DB, cfg *configuration.Config) erro
|
|||
case <-time.After(time.Duration(cfg.Dispatcher.PollSeconds) * time.Second):
|
||||
}
|
||||
}
|
||||
if err := vpc.DeleteVPC(db, c.Name, cfg); err != nil {
|
||||
if err := vpc.DeleteVPC(db, c.Name); err != nil {
|
||||
return err
|
||||
}
|
||||
current, err := state.Get(db, c.Key())
|
||||
|
|
|
|||
|
|
@ -83,8 +83,8 @@ func (c *Client) RemoveVRF(v VRF) error {
|
|||
}
|
||||
|
||||
func (c *Client) teardown(v VRF, plan func(VRF, string) []step) error {
|
||||
if err := v.validateName(); err != nil {
|
||||
return err
|
||||
if v.ID == "" {
|
||||
return fmt.Errorf("frr: vrf id must not be empty")
|
||||
}
|
||||
running, err := c.runningConfig()
|
||||
if err != nil {
|
||||
|
|
|
|||
|
|
@ -172,10 +172,10 @@ func TestRemoveVRFFailsWhenRoutingConfigurationIsStillThere(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestTeardownNeedsOnlyTheASNAndTheID(t *testing.T) {
|
||||
func TestTeardownNeedsOnlyTheID(t *testing.T) {
|
||||
f := &fakeVtysh{running: []string{"", ""}}
|
||||
if err := f.client().WithdrawVRF(VRF{ASN: 64600, ID: "a1b2"}); err != nil {
|
||||
t.Errorf("démontage refusé : %v", err)
|
||||
if err := f.client().WithdrawVRF(VRF{ID: "a1b2"}); err != nil {
|
||||
t.Errorf("démontage sans asn refusé : %v", err)
|
||||
}
|
||||
f = &fakeVtysh{}
|
||||
if err := f.client().WithdrawVRF(VRF{ASN: 64600}); err == nil || len(f.calls) != 0 {
|
||||
|
|
|
|||
|
|
@ -4,10 +4,10 @@ import (
|
|||
"fmt"
|
||||
"net"
|
||||
"strings"
|
||||
|
||||
"git.g3e.fr/syonad/two/internal/netif"
|
||||
)
|
||||
|
||||
const MaxL3VNI = 1<<16 - 1
|
||||
|
||||
type Base struct {
|
||||
ASN uint32
|
||||
RouterID net.IP
|
||||
|
|
@ -116,8 +116,8 @@ func (v VRF) validate() error {
|
|||
if err := v.validateName(); err != nil {
|
||||
return err
|
||||
}
|
||||
if v.L3VNI == 0 || v.L3VNI > netif.MaxVNI {
|
||||
return fmt.Errorf("frr: l3vni %d does not fit in 24 bits", v.L3VNI)
|
||||
if v.L3VNI == 0 || v.L3VNI > MaxL3VNI {
|
||||
return fmt.Errorf("frr: l3vni %d out of range 1-%d: the route distinguisher <vtep>:<l3vni> holds 16 bits", v.L3VNI, MaxL3VNI)
|
||||
}
|
||||
if v.VTEP.To4() == nil {
|
||||
return fmt.Errorf("frr: vtep %v is not an IPv4 address", v.VTEP)
|
||||
|
|
|
|||
|
|
@ -117,8 +117,9 @@ func TestVRFValidateRejects(t *testing.T) {
|
|||
}{
|
||||
"asn nul": {func(v *VRF) { v.ASN = 0 }, "asn must not be 0"},
|
||||
"id vide": {func(v *VRF) { v.ID = "" }, "vrf id must not be empty"},
|
||||
"l3vni nul": {func(v *VRF) { v.L3VNI = 0 }, "l3vni 0 does not fit in 24 bits"},
|
||||
"l3vni sur 25 bits": {func(v *VRF) { v.L3VNI = 16777216 }, "l3vni 16777216 does not fit in 24 bits"},
|
||||
"l3vni nul": {func(v *VRF) { v.L3VNI = 0 }, "l3vni 0 out of range 1-65535"},
|
||||
"l3vni sur 17 bits": {func(v *VRF) { v.L3VNI = 65536 }, "l3vni 65536 out of range 1-65535"},
|
||||
"l3vni sur 24 bits": {func(v *VRF) { v.L3VNI = 16777215 }, "l3vni 16777215 out of range 1-65535"},
|
||||
"vtep absent": {func(v *VRF) { v.VTEP = nil }, "vtep <nil> is not an IPv4 address"},
|
||||
"vtep IPv6": {func(v *VRF) { v.VTEP = net.ParseIP("fd00::1") }, "vtep fd00::1 is not an IPv4 address"},
|
||||
"supernet absent": {func(v *VRF) { v.Supernet = nil }, "supernet <nil> is not an IPv4 prefix"},
|
||||
|
|
@ -133,10 +134,10 @@ func TestVRFValidateRejects(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestVRFAcceptsTheLargest24BitVNI(t *testing.T) {
|
||||
func TestVRFAcceptsTheLargest16BitVNI(t *testing.T) {
|
||||
v := labVRF(t)
|
||||
v.L3VNI = 16777215
|
||||
v.L3VNI = 65535
|
||||
if err := v.validate(); err != nil {
|
||||
t.Errorf("l3vni 16777215 refusée : %v", err)
|
||||
t.Errorf("l3vni 65535 refusée : %v", err)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@ package frr
|
|||
|
||||
import (
|
||||
"fmt"
|
||||
"strconv"
|
||||
"strings"
|
||||
)
|
||||
|
||||
|
|
@ -9,16 +10,17 @@ type step []string
|
|||
|
||||
func routingTeardown(v VRF, running string) []step {
|
||||
lines := strings.Split(running, "\n")
|
||||
bgp := hasLine(lines, v.bgpInstance())
|
||||
instance := vrfInstance(lines, v.Name())
|
||||
bgp := instance != ""
|
||||
var steps []step
|
||||
if bgp {
|
||||
steps = append(steps, step{v.bgpInstance(), "address-family ipv4 unicast", "no redistribute kernel"})
|
||||
steps = append(steps, step{instance, "address-family ipv4 unicast", "no redistribute kernel"})
|
||||
}
|
||||
if vni := vrfVNI(lines, v.Name()); vni != "" {
|
||||
steps = append(steps, step{"vrf " + v.Name(), "no vni " + vni})
|
||||
}
|
||||
if bgp {
|
||||
steps = append(steps, step{"no " + v.bgpInstance()})
|
||||
steps = append(steps, step{"no " + instance})
|
||||
}
|
||||
if hasPrefix(lines, "route-map "+v.routeMap()+" ") {
|
||||
steps = append(steps, step{"no route-map " + v.routeMap()})
|
||||
|
|
@ -36,6 +38,19 @@ func vrfTeardown(v VRF, running string) []step {
|
|||
return nil
|
||||
}
|
||||
|
||||
func vrfInstance(lines []string, name string) string {
|
||||
for _, l := range lines {
|
||||
f := strings.Fields(l)
|
||||
if len(f) != 5 || f[0] != "router" || f[1] != "bgp" || f[3] != "vrf" || f[4] != name {
|
||||
continue
|
||||
}
|
||||
if _, err := strconv.ParseUint(f[2], 10, 32); err == nil {
|
||||
return strings.Join(f, " ")
|
||||
}
|
||||
}
|
||||
return ""
|
||||
}
|
||||
|
||||
func hasLine(lines []string, want string) bool {
|
||||
for _, l := range lines {
|
||||
if strings.TrimRight(l, " \r") == want {
|
||||
|
|
|
|||
|
|
@ -97,6 +97,23 @@ func TestRoutingTeardownFollowsTheOrderFRRRequires(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestRoutingTeardownTakesTheASNOfTheInstanceFromFRR(t *testing.T) {
|
||||
want := []step{
|
||||
{"router bgp 64600 vrf vrf-a1b2", "address-family ipv4 unicast", "no redistribute kernel"},
|
||||
{"vrf vrf-a1b2", "no vni 4001"},
|
||||
{"no router bgp 64600 vrf vrf-a1b2"},
|
||||
{"no route-map EXPORT-a1b2"},
|
||||
{"no ip prefix-list PL-a1b2"},
|
||||
}
|
||||
for _, asn := range []uint32{0, 64601} {
|
||||
v := labVRF(t)
|
||||
v.ASN = asn
|
||||
if got := routingTeardown(v, fullRunning); !reflect.DeepEqual(got, want) {
|
||||
t.Errorf("asn %d :\n%q\nattendu :\n%q", asn, got, want)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
func TestRoutingTeardownIgnoresAVRFWhoseNameExtendsOurs(t *testing.T) {
|
||||
if got := routingTeardown(labVRF(t), otherOnlyRunning); got != nil {
|
||||
t.Errorf("étapes visant vrf-a1b2c : %q", got)
|
||||
|
|
|
|||
|
|
@ -1,6 +1,7 @@
|
|||
package l3vni
|
||||
|
||||
import (
|
||||
"errors"
|
||||
"fmt"
|
||||
"net"
|
||||
"strconv"
|
||||
|
|
@ -29,9 +30,12 @@ type l3VPC struct {
|
|||
|
||||
func loadL3(db *badger.DB, name, id string) (l3VPC, bool, error) {
|
||||
raw, err := kv.GetFromDB(db, "vpc/"+name+"/l3vni")
|
||||
if err != nil {
|
||||
if errors.Is(err, badger.ErrKeyNotFound) {
|
||||
return l3VPC{}, false, nil
|
||||
}
|
||||
if err != nil {
|
||||
return l3VPC{}, false, fmt.Errorf("vpc %q: reading l3vni: %w", name, err)
|
||||
}
|
||||
vni, err := strconv.ParseUint(raw, 10, 32)
|
||||
if err != nil {
|
||||
return l3VPC{}, false, fmt.Errorf("vpc %q: invalid l3vni %q", name, raw)
|
||||
|
|
@ -111,12 +115,8 @@ func createL3(h host, cfg *configuration.Config, v l3VPC) error {
|
|||
return nil
|
||||
}
|
||||
|
||||
func deleteL3(h host, cfg *configuration.Config, v l3VPC) error {
|
||||
asn, err := bgpASN(cfg)
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
frrVRF := frr.VRF{ASN: asn, ID: v.id}
|
||||
func deleteL3(h host, v l3VPC) error {
|
||||
frrVRF := frr.VRF{ID: v.id}
|
||||
if err := h.WithdrawVRF(frrVRF); err != nil {
|
||||
return fmt.Errorf("l3vni %d: withdraw frr: %w", v.vni, err)
|
||||
}
|
||||
|
|
@ -139,12 +139,12 @@ func Create(db *badger.DB, vpcName string, cfg *configuration.Config) error {
|
|||
return createL3(newSystem(), cfg, v)
|
||||
}
|
||||
|
||||
func Delete(db *badger.DB, vpcName string, cfg *configuration.Config) error {
|
||||
func Delete(db *badger.DB, vpcName string) error {
|
||||
v, ok, err := loadRouted(db, vpcName)
|
||||
if err != nil || !ok {
|
||||
return err
|
||||
}
|
||||
return deleteL3(newSystem(), cfg, v)
|
||||
return deleteL3(newSystem(), v)
|
||||
}
|
||||
|
||||
type Routing struct {
|
||||
|
|
|
|||
|
|
@ -173,16 +173,16 @@ func TestCreateL3StopsAtTheFirstFailure(t *testing.T) {
|
|||
|
||||
func TestDeleteL3WithdrawsFRRThenTheKernelThenTheVRF(t *testing.T) {
|
||||
f := &fakeHost{}
|
||||
if err := deleteL3(f, bgpConfig(), labL3(t)); err != nil {
|
||||
if err := deleteL3(f, labL3(t)); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
want := []string{
|
||||
"frr withdraw asn=64600 id=s7 vni=0",
|
||||
"frr withdraw asn=0 id=s7 vni=0",
|
||||
"del l3-s7-o",
|
||||
"del vxl3-s7",
|
||||
"del brl3-s7",
|
||||
"del vrf-s7",
|
||||
"frr remove asn=64600 id=s7 vni=0",
|
||||
"frr remove asn=0 id=s7 vni=0",
|
||||
}
|
||||
if !reflect.DeepEqual(f.calls, want) {
|
||||
t.Errorf("appels :\n%s\nattendu :\n%s", strings.Join(f.calls, "\n"), strings.Join(want, "\n"))
|
||||
|
|
@ -191,7 +191,7 @@ func TestDeleteL3WithdrawsFRRThenTheKernelThenTheVRF(t *testing.T) {
|
|||
|
||||
func TestDeleteL3KeepsTheKernelWhenFRRRefusesTheWithdrawal(t *testing.T) {
|
||||
f := &fakeHost{fail: map[string]error{"frr withdraw": errors.New("% Please unconfigure l3vni 2700")}}
|
||||
err := deleteL3(f, bgpConfig(), labL3(t))
|
||||
err := deleteL3(f, labL3(t))
|
||||
if err == nil || !strings.Contains(err.Error(), "withdraw frr") {
|
||||
t.Errorf("erreur %v", err)
|
||||
}
|
||||
|
|
@ -202,7 +202,7 @@ func TestDeleteL3KeepsTheKernelWhenFRRRefusesTheWithdrawal(t *testing.T) {
|
|||
|
||||
func TestDeleteL3KeepsTheFRRVRFWhenAKernelLinkCannotBeDeleted(t *testing.T) {
|
||||
f := &fakeHost{fail: map[string]error{"del brl3-s7": errors.New("device busy")}}
|
||||
if err := deleteL3(f, bgpConfig(), labL3(t)); err == nil || !strings.Contains(err.Error(), "delete brl3-s7") {
|
||||
if err := deleteL3(f, labL3(t)); err == nil || !strings.Contains(err.Error(), "delete brl3-s7") {
|
||||
t.Errorf("erreur %v", err)
|
||||
}
|
||||
for _, c := range f.calls {
|
||||
|
|
@ -212,9 +212,9 @@ func TestDeleteL3KeepsTheFRRVRFWhenAKernelLinkCannotBeDeleted(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestDeleteL3RequiresTheBGPSection(t *testing.T) {
|
||||
func TestDeleteL3DoesNotDependOnTheAgentBGPSection(t *testing.T) {
|
||||
f := &fakeHost{}
|
||||
if err := deleteL3(f, &configuration.Config{}, labL3(t)); err == nil || len(f.calls) != 0 {
|
||||
if err := deleteL3(f, labL3(t)); err != nil || len(f.calls) != 6 {
|
||||
t.Errorf("erreur %v, appels %q", err, f.calls)
|
||||
}
|
||||
}
|
||||
|
|
@ -252,3 +252,14 @@ func TestLoadL3(t *testing.T) {
|
|||
t.Errorf("VPC sans cidr : %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestLoadL3ReportsAReadErrorInsteadOfAVPCWithoutL3VNI(t *testing.T) {
|
||||
db := kv.InitDB(kv.Config{Path: t.TempDir()}, false)
|
||||
kv.AddInDB(db, "vpc/vp-a/cidr", "10.241.0.0/16")
|
||||
kv.AddInDB(db, "vpc/vp-a/l3vni", "2700")
|
||||
db.Close()
|
||||
_, ok, err := loadL3(db, "vp-a", "a")
|
||||
if ok || err == nil || !strings.Contains(err.Error(), "reading l3vni") {
|
||||
t.Errorf("base fermée : ok=%v err=%v, erreur de lecture attendue", ok, err)
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,12 +3,12 @@ package l3vni
|
|||
import (
|
||||
"fmt"
|
||||
|
||||
"git.g3e.fr/syonad/two/internal/netif"
|
||||
"git.g3e.fr/syonad/two/internal/frr"
|
||||
)
|
||||
|
||||
func Valid(id uint32) error {
|
||||
if id == 0 || id > netif.MaxVNI {
|
||||
return fmt.Errorf("l3vni %d does not fit in 24 bits (1-%d)", id, netif.MaxVNI)
|
||||
if id == 0 || id > frr.MaxL3VNI {
|
||||
return fmt.Errorf("l3vni %d out of range 1-%d: the route distinguisher <vtep>:<l3vni> holds 16 bits", id, frr.MaxL3VNI)
|
||||
}
|
||||
if id >= 253 && id <= 255 {
|
||||
return fmt.Errorf("l3vni %d is reserved: it is also the routing table id, and tables 253-255 belong to the kernel", id)
|
||||
|
|
|
|||
|
|
@ -5,8 +5,8 @@ import (
|
|||
"testing"
|
||||
)
|
||||
|
||||
func TestValid_AcceptsEvery24BitValueOutsideTheKernelTables(t *testing.T) {
|
||||
for _, id := range []uint32{1, 252, 256, 4001, 16777215} {
|
||||
func TestValid_AcceptsEvery16BitValueOutsideTheKernelTables(t *testing.T) {
|
||||
for _, id := range []uint32{1, 252, 256, 4001, 65535} {
|
||||
if err := Valid(id); err != nil {
|
||||
t.Errorf("Valid(%d) = %v", id, err)
|
||||
}
|
||||
|
|
@ -15,8 +15,9 @@ func TestValid_AcceptsEvery24BitValueOutsideTheKernelTables(t *testing.T) {
|
|||
|
||||
func TestValid_RejectsOutOfRangeAndReservedTables(t *testing.T) {
|
||||
cases := map[uint32]string{
|
||||
0: "does not fit in 24 bits",
|
||||
16777216: "does not fit in 24 bits",
|
||||
0: "out of range 1-65535",
|
||||
65536: "out of range 1-65535",
|
||||
16777215: "out of range 1-65535",
|
||||
253: "is reserved",
|
||||
254: "is reserved",
|
||||
255: "is reserved",
|
||||
|
|
|
|||
|
|
@ -8,8 +8,6 @@ import (
|
|||
"github.com/vishvananda/netlink"
|
||||
)
|
||||
|
||||
const MaxVNI = 1<<24 - 1
|
||||
|
||||
const (
|
||||
scopeUniverse = 0
|
||||
addressSecondary = 0x01
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@ package vpc
|
|||
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"
|
||||
|
|
@ -12,13 +11,13 @@ import (
|
|||
"github.com/dgraph-io/badger/v4"
|
||||
)
|
||||
|
||||
func DeleteVPC(db *badger.DB, name string, cfg *configuration.Config) error {
|
||||
func DeleteVPC(db *badger.DB, name string) error {
|
||||
if current, err := state.Get(db, "vpc/"+name); err != nil {
|
||||
return err
|
||||
} else if current == state.Deleting {
|
||||
vpcID := strings.SplitN(name, "-", 2)[1]
|
||||
|
||||
if err := l3vni.Delete(db, name, cfg); err != nil {
|
||||
if err := l3vni.Delete(db, name); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -34,9 +34,10 @@ L3VNI, avec une configuration BGP pilotée par l'agent ; documentation du projet
|
|||
|
||||
**Routage inter-subnet entre hyperviseurs : L3VNI (#41)**
|
||||
|
||||
- Nouveau champ facultatif `l3vni` sur `POST /vpcs` (1 à 16777215, sauf 253-255 : c'est aussi
|
||||
l'identifiant de la table de routage). Absent, le VPC se comporte comme avant. Une L3VNI déjà
|
||||
portée par un VPC de l'agent est refusée (409), comme un `l3vni` demandé sans section `bgp`
|
||||
- Nouveau champ facultatif `l3vni` sur `POST /vpcs` (1 à 65535, sauf 253-255 : c'est aussi
|
||||
l'identifiant de la table de routage, et le numéro du RD `<VTEP>:<l3vni>`, sur 16 bits).
|
||||
Absent, le VPC se comporte comme avant. Une L3VNI déjà portée par un VPC de l'agent est refusée
|
||||
(409), comme un `l3vni` demandé sans section `bgp`
|
||||
- Pour un VPC routé, l'agent pose sur l'hyperviseur une VRF (table = L3VNI), un bridge à la MAC de
|
||||
routeur `02:02:<IPv4 du VTEP>`, le VXLAN de la L3VNI, un lien de transit `169.254.0.1/30` ↔
|
||||
`169.254.0.2/30` vers le netns et la route du `cidr` du VPC dans le netns ; FRR reçoit la VRF,
|
||||
|
|
|
|||
|
|
@ -175,14 +175,18 @@ build_request () {
|
|||
}
|
||||
|
||||
lab_servers () {
|
||||
local JSON Z ALL="[]"
|
||||
local JSON Z ALL="[]" RC=0
|
||||
for Z in ${ZONES}; do
|
||||
JSON=$(api GET "/baremetal/v1/zones/${Z}/servers?project_id=${PROJECT_ID}&tags=${LAB_TAG}&page_size=100") \
|
||||
|| return 1
|
||||
if ! JSON=$(api GET "/baremetal/v1/zones/${Z}/servers?project_id=${PROJECT_ID}&tags=${LAB_TAG}&page_size=100"); then
|
||||
warn "zone ${Z} : liste des serveurs de lab indisponible"
|
||||
RC=1
|
||||
continue
|
||||
fi
|
||||
ALL=$(jq -c --argjson all "${ALL}" --arg p "${PROJECT_ID}" --arg t "${LAB_TAG}" --arg z "${Z}" \
|
||||
'$all + [.servers[] | select(.project_id == $p and (.tags | index($t))) | . + {zone: $z}]' <<< "${JSON}")
|
||||
done
|
||||
printf '%s\n' "${ALL}"
|
||||
return "${RC}"
|
||||
}
|
||||
|
||||
server_ip () {
|
||||
|
|
@ -279,7 +283,8 @@ require_no_lab_server () {
|
|||
|
||||
report_uncertain_creation () {
|
||||
local FOUND
|
||||
if FOUND=$(lab_servers) && [[ $(jq 'length' <<< "${FOUND}") -gt 0 ]]; then
|
||||
FOUND=$(lab_servers)
|
||||
if [[ $(jq 'length' <<< "${FOUND}") -gt 0 ]]; then
|
||||
warn "un serveur de lab existe bien : $(jq -r '[.[].id] | join(", ")' <<< "${FOUND}")"
|
||||
fi
|
||||
die "création incertaine : le serveur a pu être créé et être facturé ; '${0##*/} status' puis '${0##*/} down'"
|
||||
|
|
@ -312,13 +317,14 @@ cmd_up () {
|
|||
}
|
||||
|
||||
cmd_status () {
|
||||
local SERVERS
|
||||
SERVERS=$(lab_servers) || die "impossible de lister les serveurs de lab"
|
||||
local SERVERS RC=0
|
||||
SERVERS=$(lab_servers) || RC=1
|
||||
if [[ $(jq 'length' <<< "${SERVERS}") -eq 0 ]]; then
|
||||
info "aucun serveur de lab dans le projet ${PROJECT_ID} (${ZONES})"
|
||||
return 0
|
||||
[[ "${RC}" -eq 0 ]] && info "aucun serveur de lab dans le projet ${PROJECT_ID} (${ZONES})"
|
||||
else
|
||||
jq -r '.[] | "\(.zone) \(.id) \(.name) \(.offer_name) \(.status) installation \(.install.status // "none") \(.created_at) \([.ips[] | select(.version == "IPv4") | .address] | join(","))"' <<< "${SERVERS}"
|
||||
fi
|
||||
jq -r '.[] | "\(.zone) \(.id) \(.name) \(.offer_name) \(.status) installation \(.install.status // "none") \(.created_at) \([.ips[] | select(.version == "IPv4") | .address] | join(","))"' <<< "${SERVERS}"
|
||||
[[ "${RC}" -eq 0 ]] || die "liste incomplète : des serveurs de lab peuvent exister dans les zones en erreur"
|
||||
}
|
||||
|
||||
require_known_server () {
|
||||
|
|
@ -424,24 +430,24 @@ wait_gone () {
|
|||
|
||||
lab_server_ids () {
|
||||
local DEADLINE=$(( SECONDS + DELETE_TIMEOUT ))
|
||||
local SERVERS
|
||||
local SERVERS="[]"
|
||||
while (( SECONDS < DEADLINE )); do
|
||||
if SERVERS=$(lab_servers); then
|
||||
jq -r '.[] | "\(.zone) \(.id)"' <<< "${SERVERS}"
|
||||
return 0
|
||||
fi
|
||||
warn "liste des serveurs de lab indisponible, nouvel essai dans ${POLL_INTERVAL}s"
|
||||
warn "liste des serveurs de lab incomplète, nouvel essai dans ${POLL_INTERVAL}s"
|
||||
sleep "${POLL_INTERVAL}"
|
||||
done
|
||||
jq -r '.[] | "\(.zone) \(.id)"' <<< "${SERVERS}"
|
||||
return 1
|
||||
}
|
||||
|
||||
cmd_down () {
|
||||
local IDS ID FAILED=0
|
||||
if ! IDS=$(lab_server_ids); then
|
||||
warn "impossible de lister les serveurs de lab après ${DELETE_TIMEOUT}s"
|
||||
warn "liste des serveurs de lab incomplète après ${DELETE_TIMEOUT}s : suppression de ceux qui sont listés"
|
||||
FAILED=1
|
||||
IDS=""
|
||||
fi
|
||||
IDS=$(printf '%s\n%s\n' "${IDS}" "${CREATED_ID}" | grep -v '^$' | sort -u)
|
||||
while read -r ZONE ID; do
|
||||
|
|
|
|||
|
|
@ -73,6 +73,8 @@ if method == "GET" and path == zone + "/os":
|
|||
if method == "GET" and path == "/iam/v1alpha1/ssh-keys":
|
||||
reply(200, {"ssh_keys": st["keys"], "total_count": len(st["keys"])})
|
||||
if method == "GET" and path == zone + "/servers":
|
||||
if st.get("zones", {}).get(zname, {}).get("list_fail"):
|
||||
reply(503, {"message": "service unavailable"})
|
||||
if st["list_errors"] > 0:
|
||||
st["list_errors"] -= 1
|
||||
reply(503, {"message": "service unavailable"})
|
||||
|
|
@ -470,6 +472,33 @@ test_down_fails_loudly_when_listing_never_works () {
|
|||
teardown
|
||||
}
|
||||
|
||||
test_down_deletes_what_answering_zones_list_when_one_zone_fails () {
|
||||
setup "down : une zone en erreur n'empêche pas de supprimer les serveurs des autres"
|
||||
mutate ".servers[\"srv-lab\"] = ${LAB_SERVER} | .zones = {\"nl-ams-2\": {list_fail: true}}"
|
||||
LAB_ZONES="fr-par-1 nl-ams-2" LAB_DELETE_TIMEOUT=1 run_lab down && fail "down a réussi malgré une zone en erreur"
|
||||
[[ $(remaining) == "foreign-1,foreign-2" ]] || fail "restants : $(remaining)"
|
||||
grep -q "zone nl-ams-2" "${WORK}/out.log" || fail "zone en erreur non signalée"
|
||||
grep -q "TOUJOURS FACTURÉ" "${WORK}/out.log" || fail "pas d'alerte de facturation"
|
||||
teardown
|
||||
}
|
||||
|
||||
test_status_lists_answering_zones_and_fails_when_one_zone_fails () {
|
||||
setup "status : liste les zones qui répondent, échoue si une zone est en erreur"
|
||||
mutate ".servers[\"srv-lab\"] = ${LAB_SERVER} | .zones = {\"nl-ams-2\": {list_fail: true}}"
|
||||
LAB_ZONES="fr-par-1 nl-ams-2" run_lab status && fail "status a réussi malgré une zone en erreur"
|
||||
grep -q "^fr-par-1 srv-lab " "${WORK}/out.log" || fail "srv-lab non listé"
|
||||
grep -q "liste incomplète" "${WORK}/out.log" || fail "liste incomplète non signalée"
|
||||
teardown
|
||||
}
|
||||
|
||||
test_up_refuses_when_one_zone_cannot_be_listed () {
|
||||
setup "up : refus si une zone ne peut pas être listée"
|
||||
mutate '.zones = {"nl-ams-2": {list_fail: true}} | .progress = [["ready","completed"]]'
|
||||
LAB_ZONES="fr-par-1 nl-ams-2" run_lab up && fail "up a réussi"
|
||||
grep -q "^POST" "${WORK}/calls.log" && fail "serveur créé sans connaître toutes les zones"
|
||||
teardown
|
||||
}
|
||||
|
||||
test_session_deletes_created_server_even_if_missing_from_list () {
|
||||
setup "session : supprime le serveur créé même absent de la liste"
|
||||
mutate '.hide_from_list = true | .progress = [["ready","completed"]]'
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue