Compare commits

..

2 commits

Author SHA1 Message Date
374bb34695
f-21: code: add dispatch command for subnet
All checks were successful
Pre Release Workflow / set-release-target (push) Successful in 1s
Pre Release Workflow / build (db, amd64, linux) (push) Successful in 1m32s
Pre Release Workflow / build (metacli, amd64, linux) (push) Successful in 1m31s
Pre Release Workflow / build (metadata, amd64, linux) (push) Successful in 1m31s
Pre Release Workflow / build (agent, amd64, linux) (push) Successful in 1m35s
Pre Release Workflow / build (dhcp, amd64, linux) (push) Successful in 1m28s
Pre Release Workflow / build (subnet, amd64, linux) (push) Successful in 1m30s
Pre Release Workflow / upload-scripts (run-dnsmasq-in-netns.sh) (push) Successful in 5s
Pre Release Workflow / prerelease (push) Successful in 12s
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
2026-04-19 21:02:54 +02:00
d028dbe57b
f-21: clean: delete vpc notions
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
2026-04-19 20:49:50 +02:00
3 changed files with 27 additions and 70 deletions

View file

@ -37,7 +37,6 @@ jobs:
- metadata
- metacli
- agent
- vpc
- dhcp
- subnet
uses: ./.forgejo/workflows/build.yml

View file

@ -1,65 +0,0 @@
package main
import (
"flag"
"fmt"
"os"
configuration "git.g3e.fr/syonad/two/internal/config/agent"
"git.g3e.fr/syonad/two/internal/vpc"
"git.g3e.fr/syonad/two/pkg/db/kv"
"github.com/dgraph-io/badger/v4"
)
var (
netns = flag.String("netns", "", "Network namespace à faire")
name = flag.String("name", "", "interface name")
action = flag.String("action", "", "Action a faire")
conf_file = flag.String("conf", "/etc/two/agent.yml", "configuration file")
)
var DB *badger.DB
func main() {
flag.Parse()
conf, err := configuration.LoadConfig(*conf_file)
if err != nil {
fmt.Println(err)
return
}
DB = kv.InitDB(kv.Config{
Path: conf.Database.Path,
}, false)
defer DB.Close()
switch *action {
case "create":
kv.AddInDB(DB, "vpc/"+*name+"/state", "creating")
if err := vpc.CreateVPC(DB, *name); err != nil {
fmt.Println(err)
}
case "delete":
kv.AddInDB(DB, "vpc/"+*name+"/state", "deleting")
if err := vpc.DeleteVPC(DB, *name); err != nil {
fmt.Println(err)
}
if state, err := kv.GetFromDB(DB, "vpc/"+*name+"/state"); err != nil {
fmt.Println(err)
os.Exit(1)
} else if state == "deleted" {
kv.DeleteInDB(DB, "vpc/"+*name)
}
case "check":
if state, err := kv.GetFromDB(DB, "vpc/"+*name+"/state"); err != nil {
os.Exit(1)
} else if state != "created" {
os.Exit(1)
}
default:
fmt.Printf("Available commande:\n - create\n - delete\n - check\n")
os.Exit(1)
}
os.Exit(0)
}

View file

@ -1,6 +1,14 @@
package dispatcher
import "github.com/dgraph-io/badger/v4"
import (
"fmt"
"os"
"strconv"
"git.g3e.fr/syonad/two/internal/subnet"
"git.g3e.fr/syonad/two/pkg/db/kv"
"github.com/dgraph-io/badger/v4"
)
type CreateSubnetCommand struct {
Name string
@ -12,8 +20,13 @@ type CreateSubnetCommand struct {
}
func (c CreateSubnetCommand) Execute(db *badger.DB) error {
// TODO: brancher internal/subnet/create.go
return nil
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+"/gateway_ip", c.GatewayIP)
kv.AddInDB(db, "subnet/"+c.Name+"/cidr", c.CIDR)
return subnet.CreateSubnet(db, c.Name)
}
type DeleteSubnetCommand struct {
@ -21,6 +34,16 @@ type DeleteSubnetCommand struct {
}
func (c DeleteSubnetCommand) Execute(db *badger.DB) error {
// TODO: brancher internal/subnet/delete.go
kv.AddInDB(db, "subnet/"+c.Name+"/state", "deleting")
if err := subnet.DeleteSubnet(db, c.Name); err != nil {
fmt.Println(err)
os.Exit(1)
}
if state, err := kv.GetFromDB(db, "subnet/"+c.Name+"/state"); err != nil {
fmt.Println(err)
os.Exit(1)
} else if state == "deleted" {
kv.DeleteInDB(db, "subnet/"+c.Name)
}
return nil
}