f-41: l3vni: suppression d'une VPC routée sans section bgp #41

Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
GnomeZworc 2026-10-12 13:05:24 +02:00
commit 0679639b95
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632
9 changed files with 56 additions and 28 deletions

View file

@ -115,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)
}
@ -143,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 {

View file

@ -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)
}
}