switch from virtbuf to virtpb

create.go

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

event.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"go.wit.com/lib/gui/shell"
-	pb "go.wit.com/lib/protobuf/virtbuf"
+	"go.wit.com/lib/protobuf/virtpb"
 	"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
 // 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
 	var msg string
 	var data []byte
@@ -75,7 +75,7 @@ func (h *HyperT) start(d *pb.Droplet) (bool, string) {
 	return true, result
 }
 
-func findDroplet(name string) *pb.Droplet {
+func findDroplet(name string) *virtpb.Droplet {
 	loop := me.cluster.DropletsAll() // get the list of droplets
 	for loop.Scan() {
 		d := loop.Next()

structs.go

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