start moving away from old cluster code

Signed-off-by: Jeff Carr <jcarr@wit.com>

Makefile

@@ -1,8 +1,5 @@
 VERSION = $(shell git describe --tags)
-
-# create the go.mod and go.sum if this is a brand new repo
-# REDOMOD = $(shell if [ -e go.mod ]; then  echo go.mod; else echo no go mod; fi)
-REDOMOD = $(shell if [ -e go.sum ]; then  echo go.sum exists; else GO111MODULE= go mod init; GO111MODULE= go mod tidy; fi)
+BUILDTIME = $(shell date +%Y.%m.%d)
 
 all: build
 	./virtigoctl --version
@@ -10,12 +7,16 @@ all: build
 	make dump-droplets
 
 build:
-	GO111MODULE=off go build -v -ldflags "-X main.Version=${VERSION} -X gui.GUIVERSION=${VERSION}"
+	GO111MODULE=off go build \
+		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
 
-# this is for release builds using the go.mod files
-release-build:
-	@echo ${REDOMOD}
-	go build -v -ldflags "-X main.Version=${VERSION} -X gui.GUIVERSION=${VERSION}"
+verbose:
+	GO111MODULE=off go build -v -x \
+		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
+
+install:
+	GO111MODULE=off go install \
+		-ldflags "-X main.VERSION=${VERSION} -X main.BUILDTIME=${BUILDTIME} -X gui.GUIVERSION=${VERSION}"
 
 # autofixes your import headers in your golang files
 goimports:
@@ -31,14 +32,6 @@ clean:
 	rm -f go.*
 	rm -f virtigo*
 
-# git clone the sources and all the golang dependancies into ~/go/src
-# if you don't have go-clone, you can get it from http://go.wit.com/
-git-clone:
-	go-clone --recursive --go-src --no-work go.wit.com/apps/go-clone
-	go-clone --recursive --go-src --no-work go.wit.com/apps/virtigo
-	go-clone --recursive --go-src --no-work go.wit.com/apps/gowebd
-	go-clone --recursive --go-src --no-work go.wit.com/lib/daemons/virtigod
-
 dump-uptime:
 	./virtigoctl dump --uptime=true
 
@@ -54,5 +47,5 @@ dump-hypervisors:
 start:
 	./virtigoctl --start www.wit.com go.wit.com
 
-filename-nagios:
+create-from-nagios-filename:
 	./virtigoctl create --filename=/home/nfs1/node004/kvm/nagios.lab.wit.org.qcow2

argv.go

@@ -28,8 +28,10 @@ type ImportXml struct {
 	IgnoreCpu  bool     `arg:"--xml-ignore-cpu"  default:"true"  help:"ignore non-standard libvirt xml cpus"`
 	IgnoreBr   bool     `arg:"--xml-ignore-net"  default:"true"  help:"ignore network bridge name changes"`
 	IgnDisk    bool     `arg:"--xml-ignore-disk" default:"false" help:"ignore duplicate disk names"`
-	DomainName string   `arg:"--name"                            help:"virsh domain name"`
-	Host       string   `arg:"--host"                            help:"hypervisor hostname"`
+	DomainName string   `arg:"--domain"                          help:"the virsh domain name"`
+	Host       string   `arg:"--host"                            help:"the hypervisor hostname (optional)"`
+	Delete     bool     `arg:"--delete"          default:"false" help:"delete the old xml after import"`
+	Force      bool     `arg:"--force"           default:"false" help:"attempts to merge xml with existing protobuf"`
 }
 
 type args struct {

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,17 @@ func createFilename(dir string, filename string) error {
 	hostname := strings.TrimSuffix(filename, filetype)
 	log.Info("hostname ==", hostname)
 
-	var newDroplet *pb.Droplet
-	newDroplet = new(pb.Droplet)
-	newDroplet.Hostname = 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 *virtpb.Network
+	eth = new(virtpb.Network)
+	eth.Name = "worldbr"
+	newDroplet.Networks = append(newDroplet.Networks, eth)
+
 	url := urlbase + "/create"
 
 	//	body, err := postDropletJSON(url, newDroplet)
@@ -56,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
@@ -71,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,10 +75,10 @@ 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.Droplet()
+		d := loop.Next()
 		if d.Hostname == name {
 			return d
 		}

main.go

@@ -66,11 +66,23 @@ func main() {
 	}
 
 	if argv.Import != nil {
-		log.Info("should import here", argv.Start)
-		log.Info("virtigoctl import --host farm04 --name grafana")
-		log.Info("import", argv.Import.Host, argv.Import.DomainName)
+		if argv.Import.DomainName == "" {
+			pp.WriteHelp(os.Stdout)
+			log.DaemonMode(true)
+			log.Info("Example:")
+			log.Info("")
+			log.Info("       virtigoctl import --domain grafana   # will look for an existing libvirt domain")
+			log.Info("")
 			os.Exit(0)
 		}
+		log.Info("\n\nshould import here", argv.Start, "\n")
+		log.Info("import", argv.Import.Host, argv.Import.DomainName)
+		url := "/import?domainName=" + argv.Import.DomainName
+		if argv.Import.Force {
+			url += "&force=true"
+		}
+		dumpStdout(url)
+	}
 }
 
 func dumpDroplets(full bool) error {

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.NewCluster             // basic cluster settings
-	hmap      map[*pb.Hypervisor]*HyperT // map to the local struct
+	cluster   *virtpb.OldCluster                // 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