f-41: l3vni: erreur de lecture distincte d'une VPC sans l3vni #41
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
6b853ded48
commit
588a9ee665
2 changed files with 16 additions and 1 deletions
|
|
@ -1,6 +1,7 @@
|
||||||
package l3vni
|
package l3vni
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
"net"
|
"net"
|
||||||
"strconv"
|
"strconv"
|
||||||
|
|
@ -29,9 +30,12 @@ type l3VPC struct {
|
||||||
|
|
||||||
func loadL3(db *badger.DB, name, id string) (l3VPC, bool, error) {
|
func loadL3(db *badger.DB, name, id string) (l3VPC, bool, error) {
|
||||||
raw, err := kv.GetFromDB(db, "vpc/"+name+"/l3vni")
|
raw, err := kv.GetFromDB(db, "vpc/"+name+"/l3vni")
|
||||||
if err != nil {
|
if errors.Is(err, badger.ErrKeyNotFound) {
|
||||||
return l3VPC{}, false, nil
|
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)
|
vni, err := strconv.ParseUint(raw, 10, 32)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return l3VPC{}, false, fmt.Errorf("vpc %q: invalid l3vni %q", name, raw)
|
return l3VPC{}, false, fmt.Errorf("vpc %q: invalid l3vni %q", name, raw)
|
||||||
|
|
|
||||||
|
|
@ -252,3 +252,14 @@ func TestLoadL3(t *testing.T) {
|
||||||
t.Errorf("VPC sans cidr : %v", err)
|
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)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue