f-28: add subnet default_route field
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
parent
76a840b80a
commit
bb5698fdda
7 changed files with 99 additions and 38 deletions
|
|
@ -12,13 +12,14 @@ import (
|
|||
)
|
||||
|
||||
type CreateSubnetCommand struct {
|
||||
Name string
|
||||
VPC string
|
||||
Mode string
|
||||
VxlanID int
|
||||
IfaceType string
|
||||
InterfaceIP string
|
||||
CIDR string
|
||||
Name string
|
||||
VPC string
|
||||
Mode string
|
||||
VxlanID int
|
||||
IfaceType string
|
||||
InterfaceIP string
|
||||
CIDR string
|
||||
DefaultRoute bool
|
||||
}
|
||||
|
||||
func (c CreateSubnetCommand) Prepare(db *badger.DB, cfg *configuration.Config) error {
|
||||
|
|
@ -48,6 +49,7 @@ func (c CreateSubnetCommand) Prepare(db *badger.DB, cfg *configuration.Config) e
|
|||
kv.AddInDB(db, "subnet/"+c.Name+"/local_iface", localIface)
|
||||
kv.AddInDB(db, "subnet/"+c.Name+"/interface_ip", c.InterfaceIP)
|
||||
kv.AddInDB(db, "subnet/"+c.Name+"/cidr", c.CIDR)
|
||||
kv.AddInDB(db, "subnet/"+c.Name+"/default_route", strconv.FormatBool(c.DefaultRoute))
|
||||
if c.Mode == "vxlan" {
|
||||
kv.AddInDB(db, "subnet/"+c.Name+"/vxlan_id", strconv.Itoa(c.VxlanID))
|
||||
}
|
||||
|
|
|
|||
|
|
@ -173,6 +173,40 @@ func TestCreateSubnetCommand_Prepare_UnknownMode(t *testing.T) {
|
|||
}
|
||||
}
|
||||
|
||||
func TestCreateSubnetCommand_Prepare_DefaultRouteStored(t *testing.T) {
|
||||
_, db := newTestDispatcher(t)
|
||||
kv.AddInDB(db, "vpc/vpc-1/state", "created")
|
||||
cmd := CreateSubnetCommand{
|
||||
Name: "sn-1", VPC: "vpc-1", VxlanID: 100,
|
||||
IfaceType: "vms", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24",
|
||||
DefaultRoute: true,
|
||||
}
|
||||
if err := cmd.Prepare(db, testCfg()); err != nil {
|
||||
t.Fatalf("Prepare a échoué : %v", err)
|
||||
}
|
||||
val, err := kv.GetFromDB(db, "subnet/sn-1/default_route")
|
||||
if err != nil {
|
||||
t.Fatalf("default_route non écrit en DB : %v", err)
|
||||
}
|
||||
if val != "true" {
|
||||
t.Errorf("default_route attendu true, obtenu %q", val)
|
||||
}
|
||||
}
|
||||
|
||||
func TestCreateSubnetCommand_Prepare_DefaultRouteFalseByDefault(t *testing.T) {
|
||||
_, db := newTestDispatcher(t)
|
||||
kv.AddInDB(db, "vpc/vpc-1/state", "created")
|
||||
cmd := CreateSubnetCommand{
|
||||
Name: "sn-1", VPC: "vpc-1", VxlanID: 100,
|
||||
IfaceType: "vms", InterfaceIP: "10.0.0.1", CIDR: "10.0.0.0/24",
|
||||
}
|
||||
cmd.Prepare(db, testCfg())
|
||||
val, _ := kv.GetFromDB(db, "subnet/sn-1/default_route")
|
||||
if val != "false" {
|
||||
t.Errorf("default_route attendu false, obtenu %q", val)
|
||||
}
|
||||
}
|
||||
|
||||
// --- DeleteSubnetCommand.Prepare ---
|
||||
|
||||
func TestDeleteSubnetCommand_Prepare_Success(t *testing.T) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue