syonad/two
2
0
Fork 0
Code Issues 6 Pull requests 1 Projects Releases 9 Packages Wiki Activity Actions

f-21: code: change from ip to interface type

Browse source 
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
GnomeZworc 2026-04-21 21:28:20 +02:00
commit 9ec6e64327
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632
8 changed files with 41 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

13
internal/dispatcher/dispatcher.go
View file

@ -8,21 +8,22 @@ import (
)
type Command interface {
Execute(db *badger.DB) error
Execute(db *badger.DB, interfaces map[string]string) error
}
type Dispatcher struct {
queue *worker.Queue
db *badger.DB
queue *worker.Queue
db *badger.DB
interfaces map[string]string
}
func New(queue *worker.Queue, db *badger.DB) *Dispatcher {
return &Dispatcher{queue: queue, db: db}
func New(queue *worker.Queue, db *badger.DB, interfaces map[string]string) *Dispatcher {
return &Dispatcher{queue: queue, db: db, interfaces: interfaces}
}
func (d *Dispatcher) Dispatch(cmd Command) {
d.queue.Submit(func() {
if err := cmd.Execute(d.db); err != nil {
if err := cmd.Execute(d.db, d.interfaces); err != nil {
log.Printf("command error (%T): %v", cmd, err)
}
})

12
internal/dispatcher/subnet_commands.go
View file

@ -14,16 +14,20 @@ type CreateSubnetCommand struct {
Name string
VPC string
VxlanID int
LocalIP string
IfaceType string
GatewayIP string
CIDR string
}
func (c CreateSubnetCommand) Execute(db *badger.DB) error {
func (c CreateSubnetCommand) Execute(db *badger.DB, interfaces map[string]string) error {
localIface, ok := interfaces[c.IfaceType]
if !ok {
return fmt.Errorf("unknown iface_type %q: not found in config", c.IfaceType)
}
kv.AddInDB(db, "subnet/"+c.Name+"/state", "creating")
kv.AddInDB(db, "subnet/"+c.Name+"/vpc", c.VPC)
kv.AddInDB(db, "subnet/"+c.Name+"/vxlan_id", strconv.Itoa(c.VxlanID))
kv.AddInDB(db, "subnet/"+c.Name+"/local_ip", c.LocalIP)
kv.AddInDB(db, "subnet/"+c.Name+"/local_iface", localIface)
kv.AddInDB(db, "subnet/"+c.Name+"/gateway_ip", c.GatewayIP)
kv.AddInDB(db, "subnet/"+c.Name+"/cidr", c.CIDR)
return subnet.CreateSubnet(db, c.Name)
@ -33,7 +37,7 @@ type DeleteSubnetCommand struct {
Name string
}
func (c DeleteSubnetCommand) Execute(db *badger.DB) error {
func (c DeleteSubnetCommand) Execute(db *badger.DB, _ map[string]string) error {
kv.AddInDB(db, "subnet/"+c.Name+"/state", "deleting")
if err := subnet.DeleteSubnet(db, c.Name); err != nil {
fmt.Println(err)

4
internal/dispatcher/vpc_commands.go
View file

@ -10,7 +10,7 @@ type CreateVPCCommand struct {
Name string
}
func (c CreateVPCCommand) Execute(db *badger.DB) error {
func (c CreateVPCCommand) Execute(db *badger.DB, _ map[string]string) error {
kv.AddInDB(db, "vpc/"+c.Name+"/state", "creating")
return vpc.CreateVPC(db, c.Name)
}
@ -19,7 +19,7 @@ type DeleteVPCCommand struct {
Name string
}
func (c DeleteVPCCommand) Execute(db *badger.DB) error {
func (c DeleteVPCCommand) Execute(db *badger.DB, _ map[string]string) error {
kv.AddInDB(db, "vpc/"+c.Name+"/state", "deleting")
if err := vpc.DeleteVPC(db, c.Name); err != nil {
return err