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

f-37: code: add state lib in vm, subnet and vpc #37

Browse source 
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
GnomeZworc 2026-08-13 23:32:00 +02:00
commit 4b5793806b
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632
6 changed files with 24 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

8
internal/subnet/create.go
View file

@ -7,18 +7,18 @@ import (
"git.g3e.fr/syonad/two/internal/ebtables" "git.g3e.fr/syonad/two/internal/ebtables"
"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" "git.g3e.fr/syonad/two/internal/state"
"git.g3e.fr/syonad/two/pkg/systemd" "git.g3e.fr/syonad/two/pkg/systemd"
"github.com/dgraph-io/badger/v4" "github.com/dgraph-io/badger/v4"
) )
func CreateSubnet(db *badger.DB, subnetName string) error { func CreateSubnet(db *badger.DB, subnetName string) error {
state, err := kv.GetFromDB(db, "subnet/"+subnetName+"/state") current, err := state.Get(db, "subnet/"+subnetName)
if err != nil { if err != nil {
return err return err
} }
if state != "creating" { if current != state.Creating {
return nil return nil
} }
@ -31,7 +31,7 @@ func CreateSubnet(db *badger.DB, subnetName string) error {
return err return err
} }
return kv.AddInDB(db, "subnet/"+subnetName+"/state", "created") return state.Set(db, "subnet/"+subnetName, state.Running)
} }
func createSubnet(db *badger.DB, subnetName string, d subnetData) error { func createSubnet(db *badger.DB, subnetName string, d subnetData) error {

7
internal/subnet/delete.go
View file

@ -7,6 +7,7 @@ import (
"git.g3e.fr/syonad/two/internal/ebtables" "git.g3e.fr/syonad/two/internal/ebtables"
"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/internal/state"
"git.g3e.fr/syonad/two/pkg/db/kv" "git.g3e.fr/syonad/two/pkg/db/kv"
"git.g3e.fr/syonad/two/pkg/systemd" "git.g3e.fr/syonad/two/pkg/systemd"
@ -14,11 +15,11 @@ import (
) )
func DeleteSubnet(db *badger.DB, subnetName string) error { func DeleteSubnet(db *badger.DB, subnetName string) error {
state, err := kv.GetFromDB(db, "subnet/"+subnetName+"/state") current, err := state.Get(db, "subnet/"+subnetName)
if err != nil { if err != nil {
return err return err
} }
if state != "deleting" { if current != state.Deleting {
return nil return nil
} }
@ -44,7 +45,7 @@ func DeleteSubnet(db *badger.DB, subnetName string) error {
return fmt.Errorf("unknown subnet mode %q", d.mode) return fmt.Errorf("unknown subnet mode %q", d.mode)
} }
return kv.AddInDB(db, "subnet/"+subnetName+"/state", "deleted") return state.Set(db, "subnet/"+subnetName, state.Deleted)
} }
func stopDHCP(db *badger.DB, subnetName string, d subnetData) error { func stopDHCP(db *badger.DB, subnetName string, d subnetData) error {

8
internal/vm/create.go
View file

@ -12,17 +12,17 @@ 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/internal/qemu" "git.g3e.fr/syonad/two/internal/qemu"
"git.g3e.fr/syonad/two/pkg/db/kv" "git.g3e.fr/syonad/two/internal/state"
"github.com/dgraph-io/badger/v4" "github.com/dgraph-io/badger/v4"
) )
func StartVM(db *badger.DB, name string, cfg *configuration.Config) error { func StartVM(db *badger.DB, name string, cfg *configuration.Config) error {
state, err := kv.GetFromDB(db, "vm/"+name+"/state") current, err := state.Get(db, "vm/"+name)
if err != nil { if err != nil {
return err return err
} }
if state != "starting" { if current != state.Creating {
return nil return nil
} }
@ -84,7 +84,7 @@ func StartVM(db *badger.DB, name string, cfg *configuration.Config) error {
return fmt.Errorf("start qemu: %w", err) return fmt.Errorf("start qemu: %w", err)
} }
return kv.AddInDB(db, "vm/"+name+"/state", "started") return state.Set(db, "vm/"+name, state.Running)
} }
func copyFile(src, dst string) error { func copyFile(src, dst string) error {

8
internal/vm/delete.go
View file

@ -12,17 +12,17 @@ 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/internal/qmp" "git.g3e.fr/syonad/two/internal/qmp"
"git.g3e.fr/syonad/two/pkg/db/kv" "git.g3e.fr/syonad/two/internal/state"
"github.com/dgraph-io/badger/v4" "github.com/dgraph-io/badger/v4"
) )
func StopVM(db *badger.DB, name string, cfg *configuration.Config) error { func StopVM(db *badger.DB, name string, cfg *configuration.Config) error {
state, err := kv.GetFromDB(db, "vm/"+name+"/state") current, err := state.Get(db, "vm/"+name)
if err != nil { if err != nil {
return err return err
} }
if state != "stopping" { if current != state.Deleting {
return nil return nil
} }
@ -65,7 +65,7 @@ func StopVM(db *badger.DB, name string, cfg *configuration.Config) error {
os.Remove(varsPath) os.Remove(varsPath)
} }
return kv.AddInDB(db, "vm/"+name+"/state", "stopped") return state.Set(db, "vm/"+name, state.Deleted)
} }
func waitQMPDead(socketPath string, timeout, poll time.Duration) { func waitQMPDead(socketPath string, timeout, poll time.Duration) {

8
internal/vpc/create.go
View file

@ -5,15 +5,15 @@ 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" "git.g3e.fr/syonad/two/internal/state"
"github.com/dgraph-io/badger/v4" "github.com/dgraph-io/badger/v4"
) )
func CreateVPC(db *badger.DB, name string) error { func CreateVPC(db *badger.DB, name string) error {
if state, err := kv.GetFromDB(db, "vpc/"+name+"/state"); err != nil { if current, err := state.Get(db, "vpc/"+name); err != nil {
return err return err
} else if state == "creating" { } else if current == state.Creating {
vpcID := strings.SplitN(name, "-", 2)[1] vpcID := strings.SplitN(name, "-", 2)[1]
if err := netns.Create(name); err != nil { if err := netns.Create(name); err != nil {
@ -48,7 +48,7 @@ func CreateVPC(db *badger.DB, name string) error {
}); err != nil { }); err != nil {
return err return err
} }
kv.AddInDB(db, "vpc/"+name+"/state", "created") return state.Set(db, "vpc/"+name, state.Running)
} }
return nil return nil
} }

8
internal/vpc/delete.go
View file

@ -5,15 +5,15 @@ 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" "git.g3e.fr/syonad/two/internal/state"
"github.com/dgraph-io/badger/v4" "github.com/dgraph-io/badger/v4"
) )
func DeleteVPC(db *badger.DB, name string) error { func DeleteVPC(db *badger.DB, name string) error {
if state, err := kv.GetFromDB(db, "vpc/"+name+"/state"); err != nil { if current, err := state.Get(db, "vpc/"+name); err != nil {
return err return err
} else if state == "deleting" { } else if current == state.Deleting {
vpcID := strings.SplitN(name, "-", 2)[1] vpcID := strings.SplitN(name, "-", 2)[1]
if err := netif.DeleteLink("vp-" + vpcID + "-e"); err != nil { if err := netif.DeleteLink("vp-" + vpcID + "-e"); err != nil {
@ -23,7 +23,7 @@ func DeleteVPC(db *badger.DB, name string) error {
if err := netns.Delete(name); err != nil { if err := netns.Delete(name); err != nil {
return err return err
} }
kv.AddInDB(db, "vpc/"+name+"/state", "deleted") return state.Set(db, "vpc/"+name, state.Deleted)
} }
return nil return nil