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

f-25: fix: reduce options number

Browse source 
Signed-off-by: GnomeZworc <nicolas.boufidjeline@g3e.fr>
This commit is contained in:
GnomeZworc 2026-04-26 17:49:32 +02:00
commit 2063199ebd
Signed by: nicolas.boufideline
GPG key ID: 4406BBBF8845D632
2 changed files with 22 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

19
internal/vm/create.go
View file

@ -3,6 +3,7 @@ package vm
import ( import (
"fmt" "fmt"
"strconv" "strconv"
"strings"
"git.g3e.fr/syonad/two/internal/iptables" "git.g3e.fr/syonad/two/internal/iptables"
"git.g3e.fr/syonad/two/internal/metadata" "git.g3e.fr/syonad/two/internal/metadata"
@ -23,16 +24,23 @@ func StartVM(db *badger.DB, name string) error {
return nil return nil
} }
vpcName, err := kv.GetFromDB(db, "vm/"+name+"/vpc") subnetName, err := kv.GetFromDB(db, "vm/"+name+"/subnet")
if err != nil {
return fmt.Errorf("get subnet: %w", err)
}
vpcName, err := kv.GetFromDB(db, "subnet/"+subnetName+"/vpc")
if err != nil { if err != nil {
return fmt.Errorf("get vpc: %w", err) return fmt.Errorf("get vpc: %w", err)
} }
bridge, err := kv.GetFromDB(db, "vm/"+name+"/bridge") gatewayIP, err := kv.GetFromDB(db, "subnet/"+subnetName+"/gateway_ip")
if err != nil { if err != nil {
return fmt.Errorf("get bridge: %w", err) return fmt.Errorf("get gateway_ip: %w", err)
} }
bridge := "br-" + strings.SplitN(subnetName, "-", 2)[1]
tapIDStr, err := kv.GetFromDB(db, "vm/"+name+"/tap_id") tapIDStr, err := kv.GetFromDB(db, "vm/"+name+"/tap_id")
if err != nil { if err != nil {
return fmt.Errorf("get tap_id: %w", err) return fmt.Errorf("get tap_id: %w", err)
@ -47,11 +55,6 @@ func StartVM(db *badger.DB, name string) error {
return fmt.Errorf("get ip: %w", err) return fmt.Errorf("get ip: %w", err)
} }
gatewayIP, err := kv.GetFromDB(db, "vm/"+name+"/gateway_ip")
if err != nil {
return fmt.Errorf("get gateway_ip: %w", err)
}
metadataPort, err := kv.GetFromDB(db, "vm/"+name+"/metadata_port") metadataPort, err := kv.GetFromDB(db, "vm/"+name+"/metadata_port")
if err != nil { if err != nil {
return fmt.Errorf("get metadata_port: %w", err) return fmt.Errorf("get metadata_port: %w", err)

17
internal/vm/delete.go
View file

@ -25,11 +25,21 @@ func StopVM(db *badger.DB, name string, cfg *configuration.Config) error {
return nil return nil
} }
vpcName, err := kv.GetFromDB(db, "vm/"+name+"/vpc") subnetName, err := kv.GetFromDB(db, "vm/"+name+"/subnet")
if err != nil {
return fmt.Errorf("get subnet: %w", err)
}
vpcName, err := kv.GetFromDB(db, "subnet/"+subnetName+"/vpc")
if err != nil { if err != nil {
return fmt.Errorf("get vpc: %w", err) return fmt.Errorf("get vpc: %w", err)
} }
gatewayIP, err := kv.GetFromDB(db, "subnet/"+subnetName+"/gateway_ip")
if err != nil {
return fmt.Errorf("get gateway_ip: %w", err)
}
tapIDStr, err := kv.GetFromDB(db, "vm/"+name+"/tap_id") tapIDStr, err := kv.GetFromDB(db, "vm/"+name+"/tap_id")
if err != nil { if err != nil {
return fmt.Errorf("get tap_id: %w", err) return fmt.Errorf("get tap_id: %w", err)
@ -44,11 +54,6 @@ func StopVM(db *badger.DB, name string, cfg *configuration.Config) error {
return fmt.Errorf("get ip: %w", err) return fmt.Errorf("get ip: %w", err)
} }
gatewayIP, err := kv.GetFromDB(db, "vm/"+name+"/gateway_ip")
if err != nil {
return fmt.Errorf("get gateway_ip: %w", err)
}
metadataPort, err := kv.GetFromDB(db, "vm/"+name+"/metadata_port") metadataPort, err := kv.GetFromDB(db, "vm/"+name+"/metadata_port")
if err != nil { if err != nil {
return fmt.Errorf("get metadata_port: %w", err) return fmt.Errorf("get metadata_port: %w", err)