use v3 api to manage powerstate & display host

cmd/displayers/cluster.go

@@ -51,12 +51,12 @@ func (o Clusters) header() []string {
 	return []string{
 		"UUID",
 		"Name",
-		"nos_version",
-		"ncc_version",
-		"OperationMode",
+		"AOS Version",
+		"Operation Mode",
+		"Hypervisor",
+		"Hosts",
 		"Inefficient VMs",
 		"ExternalIP",
-		"Nodes",
 		"Categories",
 	}
 }
@@ -68,10 +68,13 @@ func (o Clusters) TableData(w io.Writer) error {
 			continue
 		}
 		var hosts = 0
+		hypervisor := ""
 		if cluster.Status.Resources.Nodes != nil {
+			hypervisor = cluster.Status.Resources.Nodes.HypervisorServerList[0].Type
 			for _, host := range cluster.Status.Resources.Nodes.HypervisorServerList {
 				if host.IP != "127.0.0.1" {
 					hosts++
+
 				}
 			}
 
@@ -89,11 +92,11 @@ func (o Clusters) TableData(w io.Writer) error {
 			cluster.Metadata.UUID,
 			cluster.Spec.Name,
 			cluster.Spec.Resources.Config.SoftwareMap["NOS"].Version,
-			cluster.Spec.Resources.Config.SoftwareMap["NCC"].Version,
 			cluster.Spec.Resources.Config.OperationMode,
+			hypervisor,
+			strconv.Itoa(hosts),
 			*cluster.Status.Resources.Analysis.VMEfficiencyMap.InefficientVMNum,
 			cluster.Spec.Resources.Network.ExternalIP,
-			strconv.Itoa(hosts),
 			strings.Join(categories, ", "),
 		}
 	}

cmd/displayers/vm.go

@@ -56,6 +56,7 @@ func (o VMs) header() []string {
 		"Subnet",
 		"IP",
 		"Cluster",
+		"Host",
 		"MiB",
 		"CPU",
 		"Disks",
@@ -78,6 +79,10 @@ func (o VMs) TableData(w io.Writer) error {
 		if vm.Metadata.ProjectReference != nil {
 			state = vm.Metadata.ProjectReference.Name
 		}
+		host := ""
+		if vm.Status.Resources.HostReference != nil {
+			host = vm.Status.Resources.HostReference.Name
+		}
 		data[i] = []string{
 			vm.Metadata.UUID,
 			vm.Spec.Name,
@@ -86,6 +91,7 @@ func (o VMs) TableData(w io.Writer) error {
 			subnet,
 			ip,
 			vm.Spec.ClusterReference.Name,
+			host,
 			strconv.FormatInt(vm.Spec.Resources.MemorySizeMib, 10),
 			fmt.Sprintf("%d/%d", vm.Spec.Resources.NumSockets, vm.Spec.Resources.NumVcpusPerSocket),
 			fmt.Sprintf("%d", len(vm.Spec.Resources.DiskList)),

cmd/host_list.go

@@ -15,8 +15,6 @@
 package cmd
 
 import (
-	"context"
-
 	"github.com/simonfuhrer/nutactl/cmd/displayers"
 	"github.com/spf13/cobra"
 	"github.com/tecbiz-ch/nutanix-go-sdk/pkg/utils"
@@ -63,7 +61,7 @@ func runHostList(cli *CLI, cmd *cobra.Command, args []string) error {
 		list.Entities = append(list.Entities, item.Entities...)
 	}
 
-	clusters, err := cli.client.Cluster.All(context.Background())
+	clusters, err := cli.client.Cluster.All(cli.Context)
 	if err != nil {
 		return err
 	}

cmd/vm_list.go

@@ -85,5 +85,20 @@ func runVMList(cli *CLI, cmd *cobra.Command, args []string) error {
 		list.Entities = append(list.Entities, item.Entities...)
 	}
 
+	hosts, err := cli.Client().Host.All(cli.Context)
+	if err != nil {
+		return err
+	}
+
+	m := make(map[string]string)
+	for _, h := range hosts.Entities {
+		m[h.Metadata.UUID] = h.Spec.Name
+	}
+	for _, vm := range list.Entities {
+		if vm.Status.Resources.HostReference != nil {
+			vm.Status.Resources.HostReference.Name = m[vm.Status.Resources.HostReference.UUID]
+		}
+	}
+
 	return outputResponse(displayers.VMs{VMListIntent: list})
 }

cmd/vm_powerstate.go

@@ -118,11 +118,12 @@ func changeVMPowerState(cli *CLI, powerState v2.PowerState, args []string) error
 	if vm == nil {
 		return fmt.Errorf("vm not found: %s", idOrName)
 	}
-	task, err := cli.Client().VM.SetPowerState(cli.Context, powerState, vm)
-	if err != nil {
-		return err
+	if vm.Spec.Resources.PowerState == string(powerState) {
+		return fmt.Errorf("VM already powered %s", string(powerState))
 	}
-	err = cli.WaitTask(cli.Context, task.TaskUUID, 180)
+
+	vm.Spec.Resources.PowerState = string(powerState)
+	_, err = cli.Client().VM.Update(cli.Context, vm)
 	if err != nil {
 		return err
 	}