jcarr
/
virtigoctl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

switch from virtbuf to virtpb

This commit is contained in:
Jeff Carr 2025-02-22 17:48:10 -06:00
parent 6ee6fd8a96
commit 498bfe82f0
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
create.go
View File

@ -8,7 +8,7 @@ import (
"path/filepath" "path/filepath"
"strings" "strings"
pb "go.wit.com/lib/protobuf/virtbuf" "go.wit.com/lib/protobuf/virtpb"
"go.wit.com/log" "go.wit.com/log"
"google.golang.org/protobuf/proto" "google.golang.org/protobuf/proto"
) )
@ -25,14 +25,14 @@ func createFilename(dir string, filename string) error {
hostname := strings.TrimSuffix(filename, filetype) hostname := strings.TrimSuffix(filename, filetype)
log.Info("hostname ==", hostname) log.Info("hostname ==", hostname)
newDroplet := pb.NewDefaultDroplet(hostname) newDroplet := virtpb.NewDefaultDroplet(hostname)
newDisk := new(pb.Disk) newDisk := new(virtpb.Disk)
newDisk.Filename = filename newDisk.Filename = filename
newDisk.Filepath = dir newDisk.Filepath = dir
newDroplet.Disks = append(newDroplet.Disks, newDisk) newDroplet.Disks = append(newDroplet.Disks, newDisk)
var eth *pb.Network var eth *virtpb.Network
eth = new(pb.Network) eth = new(virtpb.Network)
eth.Name = "worldbr" eth.Name = "worldbr"
newDroplet.Networks = append(newDroplet.Networks, eth) newDroplet.Networks = append(newDroplet.Networks, eth)
@ -59,7 +59,7 @@ func createFilename(dir string, filename string) error {
} }
// send protobuf as wire data // send protobuf as wire data
func postDropletWIRE(url string, d *pb.Droplet) (string, error) { func postDropletWIRE(url string, d *virtpb.Droplet) (string, error) {
var bytes []byte var bytes []byte
var err error var err error
// Automatically marshal to protobuf binary format // Automatically marshal to protobuf binary format
@ -74,11 +74,11 @@ func postDropletWIRE(url string, d *pb.Droplet) (string, error) {
} }
// send protobuf in json format // send protobuf in json format
func postDropletJSON(url string, d *pb.Droplet) (string, error) { func postDropletJSON(url string, d *virtpb.Droplet) (string, error) {
// send protobuf as JSON // send protobuf as JSON
bytes, err := d.MarshalJSON() bytes, err := d.MarshalJSON()
if err != nil { if err != nil {
log.Info("virtbuf.MarshalJson() failed:", err) log.Info("virtpb.MarshalJson() failed:", err)
return "", err return "", err
} }
return post(url, bytes) return post(url, bytes)

6
event.go
View File

@ -5,7 +5,7 @@ import (
"time" "time"
"go.wit.com/lib/gui/shell" "go.wit.com/lib/gui/shell"
pb "go.wit.com/lib/protobuf/virtbuf" "go.wit.com/lib/protobuf/virtpb"
"go.wit.com/log" "go.wit.com/log"
) )
@ -56,7 +56,7 @@ func dropletReady(d *pb.Droplet) (bool, string) {
// this must be bool in string because accumulated output is sometimes // this must be bool in string because accumulated output is sometimes
// written to STDOUT, sometimes to http // written to STDOUT, sometimes to http
func (h *HyperT) start(d *pb.Droplet) (bool, string) { func (h *HyperT) start(d *virtpb.Droplet) (bool, string) {
url := "http://" + h.pb.Hostname + ":2520/start?start=" + d.Hostname url := "http://" + h.pb.Hostname + ":2520/start?start=" + d.Hostname
var msg string var msg string
var data []byte var data []byte
@ -75,7 +75,7 @@ func (h *HyperT) start(d *pb.Droplet) (bool, string) {
return true, result return true, result
} }
func findDroplet(name string) *pb.Droplet { func findDroplet(name string) *virtpb.Droplet {
loop := me.cluster.DropletsAll() // get the list of droplets loop := me.cluster.DropletsAll() // get the list of droplets
for loop.Scan() { for loop.Scan() {
d := loop.Next() d := loop.Next()

8
structs.go
View File

@ -3,7 +3,7 @@ package main
import ( import (
"time" "time"
pb "go.wit.com/lib/protobuf/virtbuf" "go.wit.com/lib/protobuf/virtpb"
) )
var me virtigoT var me virtigoT
@ -20,8 +20,8 @@ func (b *virtigoT) Enable() {
// this app's variables // this app's variables
type virtigoT struct { type virtigoT struct {
cluster *pb.Cluster // basic cluster settings cluster *virtpb.Cluster // basic cluster settings
hmap map[*pb.Hypervisor]*HyperT // map to the local struct hmap map[*virtpb.Hypervisor]*HyperT // map to the local struct
names []string names []string
hypers []*HyperT hypers []*HyperT
killcount int killcount int
@ -35,7 +35,7 @@ type virtigoT struct {
// the stuff that is needed for a hypervisor // the stuff that is needed for a hypervisor
type HyperT struct { type HyperT struct {
pb *pb.Hypervisor // the Hypervisor protobuf pb *virtpb.Hypervisor // the Hypervisor protobuf
dog *time.Ticker // the watchdog timer itself dog *time.Ticker // the watchdog timer itself
lastpoll time.Time // the last time the hypervisor polled lastpoll time.Time // the last time the hypervisor polled
lastDroplets map[string]time.Time // the vm's in the last poll lastDroplets map[string]time.Time // the vm's in the last poll