From 4b5793806b85b63498be88630f28a49abcead9cf Mon Sep 17 00:00:00 2001 From: GnomeZworc Date: Thu, 13 Aug 2026 23:32:00 +0200 Subject: [PATCH] f-37: code: add state lib in vm, subnet and vpc #37 Signed-off-by: GnomeZworc --- internal/subnet/create.go | 8 ++++---- internal/subnet/delete.go | 7 ++++--- internal/vm/create.go | 8 ++++---- internal/vm/delete.go | 8 ++++---- internal/vpc/create.go | 8 ++++---- internal/vpc/delete.go | 8 ++++---- 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/internal/subnet/create.go b/internal/subnet/create.go index a3faf46..75ef62e 100644 --- a/internal/subnet/create.go +++ b/internal/subnet/create.go @@ -7,18 +7,18 @@ import ( "git.g3e.fr/syonad/two/internal/ebtables" "git.g3e.fr/syonad/two/internal/netif" "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" "github.com/dgraph-io/badger/v4" ) 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 { return err } - if state != "creating" { + if current != state.Creating { return nil } @@ -31,7 +31,7 @@ func CreateSubnet(db *badger.DB, subnetName string) error { 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 { diff --git a/internal/subnet/delete.go b/internal/subnet/delete.go index f745eda..1175fd5 100644 --- a/internal/subnet/delete.go +++ b/internal/subnet/delete.go @@ -7,6 +7,7 @@ import ( "git.g3e.fr/syonad/two/internal/ebtables" "git.g3e.fr/syonad/two/internal/netif" "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/systemd" @@ -14,11 +15,11 @@ import ( ) 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 { return err } - if state != "deleting" { + if current != state.Deleting { return nil } @@ -44,7 +45,7 @@ func DeleteSubnet(db *badger.DB, subnetName string) error { 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 { diff --git a/internal/vm/create.go b/internal/vm/create.go index 3e0d4a7..74ed0bb 100644 --- a/internal/vm/create.go +++ b/internal/vm/create.go @@ -12,17 +12,17 @@ import ( "git.g3e.fr/syonad/two/internal/netif" "git.g3e.fr/syonad/two/internal/netns" "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" ) 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 { return err } - if state != "starting" { + if current != state.Creating { 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 kv.AddInDB(db, "vm/"+name+"/state", "started") + return state.Set(db, "vm/"+name, state.Running) } func copyFile(src, dst string) error { diff --git a/internal/vm/delete.go b/internal/vm/delete.go index 3d808e6..f1490f0 100644 --- a/internal/vm/delete.go +++ b/internal/vm/delete.go @@ -12,17 +12,17 @@ import ( "git.g3e.fr/syonad/two/internal/netif" "git.g3e.fr/syonad/two/internal/netns" "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" ) 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 { return err } - if state != "stopping" { + if current != state.Deleting { return nil } @@ -65,7 +65,7 @@ func StopVM(db *badger.DB, name string, cfg *configuration.Config) error { 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) { diff --git a/internal/vpc/create.go b/internal/vpc/create.go index 148f70c..52e2567 100644 --- a/internal/vpc/create.go +++ b/internal/vpc/create.go @@ -5,15 +5,15 @@ import ( "git.g3e.fr/syonad/two/internal/netif" "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" ) 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 - } else if state == "creating" { + } else if current == state.Creating { vpcID := strings.SplitN(name, "-", 2)[1] if err := netns.Create(name); err != nil { @@ -48,7 +48,7 @@ func CreateVPC(db *badger.DB, name string) error { }); err != nil { return err } - kv.AddInDB(db, "vpc/"+name+"/state", "created") + return state.Set(db, "vpc/"+name, state.Running) } return nil } diff --git a/internal/vpc/delete.go b/internal/vpc/delete.go index dbd3a59..ff4d83f 100644 --- a/internal/vpc/delete.go +++ b/internal/vpc/delete.go @@ -5,15 +5,15 @@ import ( "git.g3e.fr/syonad/two/internal/netif" "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" ) 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 - } else if state == "deleting" { + } else if current == state.Deleting { vpcID := strings.SplitN(name, "-", 2)[1] 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 { return err } - kv.AddInDB(db, "vpc/"+name+"/state", "deleted") + return state.Set(db, "vpc/"+name, state.Deleted) } return nil