start migration to protobufs

Signed-off-by: Jeff Carr <[email protected]>

1 files changed, 6 insertions, 10 deletions

diff --git a/configfiles.go b/configfiles.go
index 58d83aa..927f328 100644
--- a/configfiles.go
+++ b/configfiles.go
@@ -11,10 +11,8 @@ import (
 	"go.wit.com/log"
 )
 
-var cluster *pb.Cluster
-
 func readConfigFile() {
-	cluster = new(pb.Cluster)
+	me.cluster = new(pb.Cluster)
 	homeDir, _ := os.UserHomeDir()
 	fullname := filepath.Join(homeDir, ".config/virtigo.json")
 	pfile, err := os.ReadFile(fullname)
@@ -22,7 +20,7 @@ func readConfigFile() {
 		log.Info("open config file :", err)
 		return
 	}
-	err = cluster.UnmarshalJSON(pfile)
+	err = me.cluster.UnmarshalJSON(pfile)
 	if err != nil {
 		log.Info("create json failed", err)
 		return
@@ -37,7 +35,7 @@ func writeConfigFile() {
 		log.Info("open config file :", err)
 		return
 	}
-	json := cluster.FormatJSON()
+	json := me.cluster.FormatJSON()
 	fmt.Fprintln(cfgfile, json)
 }
 
@@ -63,7 +61,6 @@ func readDropletFile(filename string) {
 		if d == nil {
 			// this is a new unknown droplet (not in the config file)
 			d = new(DropletT)
-			d.Hostname = name
 			if len(fields) > 1 && fields[1] != "ON" {
 				d.ConfigState = "OFF"
 			} else {
@@ -72,9 +69,9 @@ func readDropletFile(filename string) {
 			if len(fields) >= 3 {
 				d.hyperPreferred = fields[2]
 			}
+			d.pb = me.cluster.AddDroplet(name, 16, 256)
 			me.droplets = append(me.droplets, d)
-			log.Log(EVENT, "config new droplet", d.Hostname, d.ConfigState, d.hyperPreferred)
-			cluster.AddDroplet(d.Hostname, 16, 256)
+			log.Log(EVENT, "config new droplet", d.pb.Hostname, d.ConfigState, d.hyperPreferred)
 		} else {
 			log.Info("not sure what to do here. duplicate droplet", name, "in config file")
 		}
@@ -118,14 +115,13 @@ func addHypervisor(name string) *HyperT {
 	}
 	log.Log(EVENT, "config new hypervisor", name)
 	h = new(HyperT)
-	h.Hostname = name
 	h.Autoscan = true
 	h.Delay = 5 * time.Second
 	h.lastpoll = time.Now()
 	h.Scan = func() {
 		h.pollHypervisor()
 	}
+	h.pb = me.cluster.AddHypervisor(name, 16, 256)
 	me.hypers = append(me.hypers, h)
-	cluster.AddHypervisor(name, 16, 256)
 	return h
 }