cmd/vm-control: add -machineType option & change-vm-machine-type subc…

…ommand.

cmd/vm-control/changeVmConsoleType.go

@@ -4,9 +4,8 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/Cloud-Foundations/Dominator/lib/errors"
+	hyperclient "github.com/Cloud-Foundations/Dominator/hypervisor/client"
 	"github.com/Cloud-Foundations/Dominator/lib/log"
-	proto "github.com/Cloud-Foundations/Dominator/proto/hypervisor"
 )
 
 func changeVmConsoleTypeSubcommand(args []string,
@@ -28,20 +27,10 @@ func changeVmConsoleType(vmHostname string,
 
 func changeVmConsoleTypeOnHypervisor(hypervisor string, ipAddr net.IP,
 	logger log.DebugLogger) error {
-	request := proto.ChangeVmConsoleTypeRequest{
-		ConsoleType: consoleType,
-		IpAddress:   ipAddr,
-	}
 	client, err := dialHypervisor(hypervisor)
 	if err != nil {
 		return err
 	}
 	defer client.Close()
-	var reply proto.ChangeVmOwnerUsersResponse
-	err = client.RequestReply("Hypervisor.ChangeVmConsoleType",
-		request, &reply)
-	if err != nil {
-		return err
-	}
-	return errors.New(reply.Error)
+	return hyperclient.ChangeVmConsoleType(client, ipAddr, consoleType)
 }

cmd/vm-control/changeVmMachineType.go

@@ -0,0 +1,36 @@
+package main
+
+import (
+	"fmt"
+	"net"
+
+	hyperclient "github.com/Cloud-Foundations/Dominator/hypervisor/client"
+	"github.com/Cloud-Foundations/Dominator/lib/log"
+)
+
+func changeVmMachineTypeSubcommand(args []string,
+	logger log.DebugLogger) error {
+	if err := changeVmMachineType(args[0], logger); err != nil {
+		return fmt.Errorf("error changing VM machine type: %s", err)
+	}
+	return nil
+}
+
+func changeVmMachineType(vmHostname string,
+	logger log.DebugLogger) error {
+	if vmIP, hypervisor, err := lookupVmAndHypervisor(vmHostname); err != nil {
+		return err
+	} else {
+		return changeVmMachineTypeOnHypervisor(hypervisor, vmIP, logger)
+	}
+}
+
+func changeVmMachineTypeOnHypervisor(hypervisor string, ipAddr net.IP,
+	logger log.DebugLogger) error {
+	client, err := dialHypervisor(hypervisor)
+	if err != nil {
+		return err
+	}
+	defer client.Close()
+	return hyperclient.ChangeVmMachineType(client, ipAddr, machineType)
+}

cmd/vm-control/createVm.go

@@ -194,6 +194,7 @@ func createVmInfoFromFlags() hyper_proto.VmInfo {
 		DisableVirtIO:      *disableVirtIO,
 		ExtraKernelOptions: *extraKernelOptions,
 		Hostname:           *vmHostname,
+		MachineType:        machineType,
 		MemoryInMiB:        uint64(memory >> 20),
 		MilliCPUs:          *milliCPUs,
 		OwnerGroups:        ownerGroups,

cmd/vm-control/main.go

@@ -73,6 +73,7 @@ var (
 		"Command to destroy local VM when exporting. The VM name is given as the argument")
 	location = flag.String("location", "",
 		"Location to search for hypervisors")
+	machineType      hyper_proto.MachineType
 	memory           flagutil.Size
 	milliCPUs        = flag.Uint("milliCPUs", 0, "milli CPUs (default 250)")
 	placement        placementType
@@ -146,6 +147,8 @@ func init() {
 		"type of graphical console (default none)")
 	flag.Var(&hypervisorTagsToMatch, "hypervisorTagsToMatch",
 		"Tags to match when getting/listing or creating/copying/moving VMs")
+	flag.Var(&machineType, "machineType",
+		"Type of machine to emulate (default generic PC)")
 	flag.Var(&memory, "memory", "memory (default 1GiB)")
 	flag.Var(&minFreeBytes, "minFreeBytes",
 		"minimum number of free bytes in root volume")
@@ -192,6 +195,7 @@ var subcommands = []commands.Command{
 	{"change-vm-cpus", "IPaddr", 1, 1, changeVmCPUsSubcommand},
 	{"change-vm-destroy-protection", "IPaddr", 1, 1,
 		changeVmDestroyProtectionSubcommand},
+	{"change-vm-machine-type", "IPaddr", 1, 1, changeVmMachineTypeSubcommand},
 	{"change-vm-memory", "IPaddr", 1, 1, changeVmMemorySubcommand},
 	{"change-vm-owner-groups", "IPaddr", 1, 1, changeVmOwnerGroupsSubcommand},
 	{"change-vm-owner-users", "IPaddr", 1, 1, changeVmOwnerUsersSubcommand},