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

feature-14 #17

Merged
nicolas.boufideline merged 15 commits from feature-14 into main 2026-03-23 16:00:53 +00:00
Conversation 0 Commits 15 Files changed 11 +62 -37
2 changed files with 62 additions and 37 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f9c1cd7d32 - Show all commits

f-14: code: add db usage in vpc creation #14

Prev Next 
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
GnomeZworc 2026-01-26 20:10:56 +01:00
commit f9c1cd7d32
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632

26
cmd/vpc/main.go
View file

@ -5,21 +5,39 @@ import (
"fmt" "fmt"
"os" "os"
configuration "git.g3e.fr/syonad/two/internal/config/agent"
"git.g3e.fr/syonad/two/internal/vpc" "git.g3e.fr/syonad/two/internal/vpc"
"git.g3e.fr/syonad/two/pkg/db/kv"
"github.com/dgraph-io/badger/v4"
) )
var ( var (
netns = flag.String("netns", "", "Network namespace à faire") netns = flag.String("netns", "", "Network namespace à faire")
name = flag.String("name", "", "interface name") name = flag.String("name", "", "interface name")
action = flag.String("action", "", "Action a faire") action = flag.String("action", "", "Action a faire")
conf_file = flag.String("conf", "/etc/two/agent.yml", "configuration file")
) )
var DB *badger.DB
func main() { func main() {
flag.Parse() 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 { switch *action {
case "create": case "create":
if err := vpc.CreateVPC(*name); err != nil { kv.AddInDB(DB, "vpc/"+*name+"/state", "creating")
if err := vpc.CreateVPC(DB, *name); err != nil {
fmt.Println(err) fmt.Println(err)
} }
case "delete": case "delete":

73
internal/vpc/create.go
View file

@ -3,52 +3,59 @@ package vpc
import ( import (
"git.g3e.fr/syonad/two/internal/netif" "git.g3e.fr/syonad/two/internal/netif"
"git.g3e.fr/syonad/two/internal/netns" "git.g3e.fr/syonad/two/internal/netns"
"git.g3e.fr/syonad/two/pkg/db/kv"
"github.com/dgraph-io/badger/v4"
) )
func CreateVPC(name string) error { func CreateVPC(db *badger.DB, name string) error {
// missing // missing
// search data in db // search data in db
// change state in db // change state in db
// create netns // create netns
if err := netns.Create(name); err != nil { if state, err := kv.GetFromDB(db, "vpc/"+name+"/state"); err != nil {
return err return err
} } else if state == "creating" {
if err := netns.Create(name); err != nil {
return err
}
// create veth public for this netns // create veth public for this netns
if err := netif.CreateVethToNetns("veth"+name+"ext", "vethpublicint", "/var/run/netns/"+name, 9000); err != nil { if err := netif.CreateVethToNetns("veth"+name+"ext", "vethpublicint", "/var/run/netns/"+name, 9000); err != nil {
return err return err
} }
// create public bridge in netns // create public bridge in netns
if err := netns.Call(name, func() error { if err := netns.Call(name, func() error {
return netif.CreateBridge("br-public", 1500) return netif.CreateBridge("br-public", 1500)
}); err != nil { }); err != nil {
return err return err
} }
// set veth to ext public bridge // set veth to ext public bridge
if err := netif.BridgeSetMaster("veth"+name+"ext", "br-public"); err != nil { if err := netif.BridgeSetMaster("veth"+name+"ext", "br-public"); err != nil {
return err return err
} }
// set veth to int public bridge // set veth to int public bridge
if err := netns.Call(name, func() error { if err := netns.Call(name, func() error {
return netif.BridgeSetMaster("vethpublicint", "br-public") return netif.BridgeSetMaster("vethpublicint", "br-public")
}); err != nil { }); err != nil {
return err return err
} }
// set set ext veth up // set set ext veth up
if err := netif.LinkSetUp("veth" + name + "ext"); err != nil { if err := netif.LinkSetUp("veth" + name + "ext"); err != nil {
return nil return nil
}
// set set int veth up
if err := netns.Call(name, func() error {
return netif.LinkSetUp("vethpublicint")
}); err != nil {
return err
}
kv.AddInDB(db, "vpc/"+name+"/state", "created")
} }
// set set int veth up
if err := netns.Call(name, func() error {
return netif.LinkSetUp("vethpublicint")
}); err != nil {
return err
}
return nil return nil
} }