Move routines to subcommands;Add initial logic for datacenter configuration; Move code to package

2022-12-28 14:41:03 +01:00 · 2022-12-28 14:41:03 +01:00 · d8c361101e
commit d8c361101e
parent 103e355b8e
5 changed files with 101 additions and 33 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -3,7 +3,7 @@ type: kubernetes
 name: 'Golang Build'

 environment:
-  BINARY_VERSION: v0.3.2
+  BINARY_VERSION: v0.4.0

 clone:
  disable: true
--- a/cmd/vappprop-manager/main.go
+++ b/cmd/vappprop-manager/main.go
@ -10,43 +10,58 @@ import (
 	"spamasaurus.com/m/pkg/hypervisor"
 )

+var Global struct {
+	FQDN     string `short:"s" long:"server" description:"FQDN of the vCenter appliance" required:"true"`
+	Username string `short:"u" long:"username" description:"Username to authenticate with" required:"true"`
+	Password string `short:"p" long:"password" description:"Password to authenticate with" required:"true"`
+}
+var Commands struct {
+	Datacenter struct {
+		Name    string `short:"n" long:"name" description:"Name of datacenter" required:"true"`
+		Network string `short:"p" long:"portgroup" description:"Name of network portgroup" required:"true"`
+	} // `command:"datacenter" alias:"dc" description:"Define a Network Protocol Profile within a datacenter"`
+	VirtualMachine struct {
+		Datacenter string `short:"d" long:"datacenter" description:"Name of datacenter" required:"true"`
+		Name       string `short:"n" long:"name" description:"Name of virtual machine" required:"true"`
+		Network    string `short:"p" long:"portgroup" description:"Name of network portgroup" required:"true"`
+	} // `command:"virtualmachine" alias:"vm" description:"Configure a virtual machine for usage of Network Protocol Profiles"`
+}
+
 func main() {
-	var opts struct {
-		FQDN     string `short:"s" long:"server" description:"FQDN of the vCenter appliance" required:"true"`
-		Username string `short:"u" long:"username" description:"Username to authenticate with" required:"true"`
-		Password string `short:"p" long:"password" description:"Password to authenticate with" required:"true"`
-
-		Datacenter     string `short:"d" long:"datacenter" description:"Name of datacenter" required:"true"`
-		VirtualMachine string `short:"v" long:"virtualmachine" description:"Name of virtual machine" required:"true"`
-		Network        string `short:"n" long:"network" description:"Name of network portgroup" required:"true"`
-	}
-
-	_, err := flags.Parse(&opts)
+	parser := flags.NewParser(&Global, flags.Default)
+	parser.AddCommand("datacenter", "Define a Network Protocol Profile within a datacenter", "", &Commands.Datacenter)
+	parser.AddCommand("dc", "", "", &Commands.Datacenter)
+	parser.AddCommand("virtualmachine", "Configure a virtual machine for usage of Network Protocol Profiles", "", &Commands.VirtualMachine)
+	parser.AddCommand("vm", "", "", &Commands.VirtualMachine)
+	_, err := parser.Parse()
 	if err != nil {
-		if e, ok := err.(*flags.Error); ok {
-			if e.Type == flags.ErrHelp {
-				os.Exit(0)
-			}
+		if flagsErr, ok := err.(*flags.Error); ok && flagsErr.Type == flags.ErrHelp {
+			os.Exit(0)
+		} else {
+			os.Exit(1)
 		}
-		os.Exit(1)
 	}

 	ctx, cancel := context.WithCancel(context.Background())
 	defer cancel()

-	clt, err := hypervisor.NewClient(ctx, opts.FQDN, opts.Username, opts.Password, true)
+	clt, err := hypervisor.NewClient(ctx, Global.FQDN, Global.Username, Global.Password, true)
 	if err != nil {
 		log.Fatalf("[ERROR] Login failed: %s", err)
 	}

-	fnd, err := hypervisor.DatacenterFinder(ctx, clt, opts.Datacenter)
-	if err != nil {
-		log.Fatalf("[ERROR] Unable to determine datacenter: %s", err)
-	}
+	switch parser.Active.Name {
+	case "datacenter", "dc":
+		if err := hypervisor.CreateNetworkProtocolProfile(ctx, clt, Commands.Datacenter.Name, Commands.Datacenter.Network); err != nil {
+			log.Fatalf("[ERROR] Could not create network protocol profile: %s", err)
+		}

-	if err := hypervisor.SetVirtualMachineProperties(ctx, fnd, opts.VirtualMachine, opts.Network); err != nil {
-		log.Fatalf("[ERROR] Could not apply vApp properties: %s", err)
-	}
+		log.Printf("[SUCCESS] Hurray! We did it!")
+	case "virtualmachine", "vm":
+		if err := hypervisor.SetVirtualMachineProperties(ctx, clt, Commands.VirtualMachine.Datacenter, Commands.VirtualMachine.Name, Commands.VirtualMachine.Network); err != nil {
+			log.Fatalf("[ERROR] Could not apply vApp properties: %s", err)
+		}

-	log.Printf("[SUCCESS] Network protocol profile properties added to virtual machine '%s' and configured for network '%s'", opts.VirtualMachine, opts.Network)
+		log.Printf("[SUCCESS] Network protocol profile properties added to virtual machine '%s' and configured for network '%s'", Commands.VirtualMachine.Name, Commands.VirtualMachine.Network)
+	}
 }
--- a/go.mod
+++ b/go.mod
@ -3,11 +3,9 @@ module spamasaurus.com/m
 go 1.19

 require (
+	github.com/davecgh/go-spew v1.1.1
 	github.com/jessevdk/go-flags v1.5.0
 	github.com/vmware/govmomi v0.30.0
 )

-require (
-	github.com/davecgh/go-spew v1.1.1 // indirect
-	golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4 // indirect
-)
+require golang.org/x/sys v0.0.0-20210320140829-1e4c9ba3b0c4 // indirect
--- a/pkg/hypervisor/dc.go
+++ b/pkg/hypervisor/dc.go
@ -0,0 +1,45 @@
+package hypervisor
+
+import (
+	"context"
+	"log"
+
+	"github.com/davecgh/go-spew/spew"
+
+	"github.com/vmware/govmomi/find"
+	"github.com/vmware/govmomi/object"
+	"github.com/vmware/govmomi/vim25"
+	"github.com/vmware/govmomi/vim25/methods"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+func CreateNetworkProtocolProfile(ctx context.Context, clt *vim25.Client, datacenter, network string) error {
+	dc, err := find.NewFinder(clt, true).Datacenter(ctx, datacenter)
+	if err != nil {
+		log.Fatalf("[ERROR] Unable to determine datacenter: %s", err)
+	}
+
+	object.NewCommon(clt, dc.Reference())
+	request := &types.CreateIpPool{
+		This: types.ManagedObjectReference{
+			Type:  "",
+			Value: "",
+		},
+		Pool: types.IpPool{
+			Name: "Test",
+		},
+	}
+	response, err := methods.CreateIpPool(ctx, clt.RoundTripper, request)
+	if err != nil {
+		log.Fatalf("Bar: %s", err)
+	}
+	spew.Dump(response)
+
+	// task := object.NewTask(clt)
+	// err = task.Wait(ctx)
+	// if err != nil {
+	// 	log.Fatalf("Foo: %s", err)
+	// }
+
+	return nil
+}
--- a/pkg/hypervisor/vm.go
+++ b/pkg/hypervisor/vm.go
@ -3,8 +3,10 @@ package hypervisor
 import (
 	"context"
 	"fmt"
+	"log"

 	"github.com/vmware/govmomi/find"
+	"github.com/vmware/govmomi/vim25"
 	"github.com/vmware/govmomi/vim25/mo"
 	"github.com/vmware/govmomi/vim25/types"
 )
@ -14,10 +16,18 @@ type vAPPProperty struct {
 	Value string
 }

-func SetVirtualMachineProperties(ctx context.Context, fnd *find.Finder, virtualmachine string, network string) error {
-	vm, err := fnd.VirtualMachine(ctx, virtualmachine)
+func SetVirtualMachineProperties(ctx context.Context, clt *vim25.Client, datacenter, virtualmachine, network string) error {
+	finder := find.NewFinder(clt, true)
+
+	dc, err := finder.Datacenter(ctx, datacenter)
 	if err != nil {
-		return err
+		log.Fatalf("[ERROR] Unable to determine datacenter: %s", err)
+	}
+
+	finder.SetDatacenter(dc)
+	vm, err := finder.VirtualMachine(ctx, virtualmachine)
+	if err != nil {
+		log.Fatalf("[ERROR] Unable to determine virtual machine: %s", err)
 	}

 	var moref mo.VirtualMachine