Merge e4eb9c2 into c1f3691

cmd/vm-control/becomePrimaryVmOwner.go

@@ -3,19 +3,18 @@ package main
 import (
 	"fmt"
 	"net"
-	"os"
 
 	"github.com/Symantec/Dominator/lib/errors"
 	"github.com/Symantec/Dominator/lib/log"
 	proto "github.com/Symantec/Dominator/proto/hypervisor"
 )
 
-func becomePrimaryVmOwnerSubcommand(args []string, logger log.DebugLogger) {
+func becomePrimaryVmOwnerSubcommand(args []string,
+	logger log.DebugLogger) error {
 	if err := becomePrimaryVmOwner(args[0], logger); err != nil {
-		fmt.Fprintf(os.Stderr, "Error becoming primary VM owner: %s\n", err)
-		os.Exit(1)
+		return fmt.Errorf("Error becoming primary VM owner: %s", err)
 	}
-	os.Exit(0)
+	return nil
 }
 
 func becomePrimaryVmOwner(vmHostname string, logger log.DebugLogger) error {

cmd/vm-control/changeVmDestroyProtection.go

@@ -3,21 +3,18 @@ package main
 import (
 	"fmt"
 	"net"
-	"os"
 
 	"github.com/Symantec/Dominator/lib/errors"
 	"github.com/Symantec/Dominator/lib/log"
 	proto "github.com/Symantec/Dominator/proto/hypervisor"
 )
 
 func changeVmDestroyProtectionSubcommand(args []string,
-	logger log.DebugLogger) {
+	logger log.DebugLogger) error {
 	if err := changeVmDestroyProtection(args[0], logger); err != nil {
-		fmt.Fprintf(os.Stderr, "Error changing VM destroy protection: %s\n",
-			err)
-		os.Exit(1)
+		return fmt.Errorf("Error changing VM destroy protection: %s", err)
 	}
-	os.Exit(0)
+	return nil
 }
 
 func changeVmDestroyProtection(vmHostname string,

cmd/vm-control/changeVmMigrating.go

@@ -2,27 +2,24 @@ package main
 
 import (
 	"fmt"
-	"os"
 
 	"github.com/Symantec/Dominator/lib/errors"
 	"github.com/Symantec/Dominator/lib/log"
 	proto "github.com/Symantec/Dominator/proto/hypervisor"
 )
 
-func setVmMigratingSubcommand(args []string, logger log.DebugLogger) {
+func setVmMigratingSubcommand(args []string, logger log.DebugLogger) error {
 	if err := changeVmMigrationState(args[0], true, logger); err != nil {
-		fmt.Fprintf(os.Stderr, "Error setting VM migration state: %s\n", err)
-		os.Exit(1)
+		return fmt.Errorf("Error setting VM migration state: %s", err)
 	}
-	os.Exit(0)
+	return nil
 }
 
-func unsetVmMigratingSubcommand(args []string, logger log.DebugLogger) {
+func unsetVmMigratingSubcommand(args []string, logger log.DebugLogger) error {
 	if err := changeVmMigrationState(args[0], false, logger); err != nil {
-		fmt.Fprintf(os.Stderr, "Error clearing VM migration state: %s\n", err)
-		os.Exit(1)
+		return fmt.Errorf("Error clearing VM migration state: %s", err)
 	}
-	os.Exit(0)
+	return nil
 }
 
 func changeVmMigrationState(vmHostname string, enable bool,

cmd/vm-control/changeVmOwnerUsers.go

@@ -3,19 +3,17 @@ package main
 import (
 	"fmt"
 	"net"
-	"os"
 
 	"github.com/Symantec/Dominator/lib/errors"
 	"github.com/Symantec/Dominator/lib/log"
 	proto "github.com/Symantec/Dominator/proto/hypervisor"
 )
 
-func changeVmOwnerUsersSubcommand(args []string, logger log.DebugLogger) {
+func changeVmOwnerUsersSubcommand(args []string, logger log.DebugLogger) error {
 	if err := changeVmOwnerUsers(args[0], logger); err != nil {
-		fmt.Fprintf(os.Stderr, "Error changing VM owner users: %s\n", err)
-		os.Exit(1)
+		return fmt.Errorf("Error changing VM owner users: %s", err)
 	}
-	os.Exit(0)
+	return nil
 }
 
 func changeVmOwnerUsers(vmHostname string, logger log.DebugLogger) error {

cmd/vm-control/changeVmTags.go

@@ -3,7 +3,6 @@ package main
 import (
 	"fmt"
 	"net"
-	"os"
 
 	"github.com/Symantec/Dominator/lib/errors"
 	"github.com/Symantec/Dominator/lib/log"
@@ -12,12 +11,11 @@ import (
 	proto "github.com/Symantec/Dominator/proto/hypervisor"
 )
 
-func changeVmTagsSubcommand(args []string, logger log.DebugLogger) {
+func changeVmTagsSubcommand(args []string, logger log.DebugLogger) error {
 	if err := changeVmTags(args[0], logger); err != nil {
-		fmt.Fprintf(os.Stderr, "Error changing VM tags: %s\n", err)
-		os.Exit(1)
+		return fmt.Errorf("Error changing VM tags: %s", err)
 	}
-	os.Exit(0)
+	return nil
 }
 
 func changeVmTags(vmHostname string, logger log.DebugLogger) error {

cmd/vm-control/connectToVmSerialPort.go

@@ -12,12 +12,12 @@ import (
 	proto "github.com/Symantec/Dominator/proto/hypervisor"
 )
 
-func connectToVmSerialPortSubcommand(args []string, logger log.DebugLogger) {
+func connectToVmSerialPortSubcommand(args []string,
+	logger log.DebugLogger) error {
 	if err := connectToVmSerialPort(args[0], logger); err != nil {
-		fmt.Fprintf(os.Stderr, "Error connecting to VM serial port: %s\n", err)
-		os.Exit(1)
+		return fmt.Errorf("Error connecting to VM serial port: %s", err)
 	}
-	os.Exit(0)
+	return nil
 }
 
 func connectToVmSerialPort(vmHostname string, logger log.DebugLogger) error {

cmd/vm-control/copyVm.go

@@ -5,20 +5,18 @@ import (
 	"errors"
 	"fmt"
 	"net"
-	"os"
 
 	hyperclient "github.com/Symantec/Dominator/hypervisor/client"
 	"github.com/Symantec/Dominator/lib/log"
 	"github.com/Symantec/Dominator/lib/srpc"
 	hyper_proto "github.com/Symantec/Dominator/proto/hypervisor"
 )
 
-func copyVmSubcommand(args []string, logger log.DebugLogger) {
+func copyVmSubcommand(args []string, logger log.DebugLogger) error {
 	if err := copyVm(args[0], logger); err != nil {
-		fmt.Fprintf(os.Stderr, "Error copying VM: %s\n", err)
-		os.Exit(1)
+		return fmt.Errorf("Error copying VM: %s", err)
 	}
-	os.Exit(0)
+	return nil
 }
 
 func copyVm(vmHostname string, logger log.DebugLogger) error {

cmd/vm-control/createVm.go

@@ -24,12 +24,11 @@ func init() {
 	rand.Seed(time.Now().Unix() + time.Now().UnixNano())
 }
 
-func createVmSubcommand(args []string, logger log.DebugLogger) {
+func createVmSubcommand(args []string, logger log.DebugLogger) error {
 	if err := createVm(logger); err != nil {
-		fmt.Fprintf(os.Stderr, "Error creating VM: %s\n", err)
-		os.Exit(1)
+		return fmt.Errorf("Error creating VM: %s", err)
 	}
-	os.Exit(0)
+	return nil
 }
 
 func callCreateVm(client *srpc.Client, request hyper_proto.CreateVmRequest,

cmd/vm-control/deleteVmVolume.go

@@ -3,19 +3,17 @@ package main
 import (
 	"fmt"
 	"net"
-	"os"
 
 	hyperclient "github.com/Symantec/Dominator/hypervisor/client"
 	"github.com/Symantec/Dominator/lib/errors"
 	"github.com/Symantec/Dominator/lib/log"
 )
 
-func deleteVmVolumeSubcommand(args []string, logger log.DebugLogger) {
+func deleteVmVolumeSubcommand(args []string, logger log.DebugLogger) error {
 	if err := deleteVmVolume(args[0], logger); err != nil {
-		fmt.Fprintf(os.Stderr, "Error deleting VM volume: %s\n", err)
-		os.Exit(1)
+		return fmt.Errorf("Error deleting VM volume: %s", err)
 	}
-	os.Exit(0)
+	return nil
 }
 
 func deleteVmVolume(vmHostname string, logger log.DebugLogger) error {

cmd/vm-control/destroyVm.go

@@ -3,18 +3,16 @@ package main
 import (
 	"fmt"
 	"net"
-	"os"
 
 	hyperclient "github.com/Symantec/Dominator/hypervisor/client"
 	"github.com/Symantec/Dominator/lib/log"
 )
 
-func destroyVmSubcommand(args []string, logger log.DebugLogger) {
+func destroyVmSubcommand(args []string, logger log.DebugLogger) error {
 	if err := destroyVm(args[0], logger); err != nil {
-		fmt.Fprintf(os.Stderr, "Error destroying VM: %s\n", err)
-		os.Exit(1)
+		return fmt.Errorf("Error destroying VM: %s", err)
 	}
-	os.Exit(0)
+	return nil
 }
 
 func destroyVm(vmHostname string, logger log.DebugLogger) error {

cmd/vm-control/dial.go

@@ -5,7 +5,7 @@ import (
 )
 
 func dialFleetManager(address string) (*srpc.Client, error) {
-	return srpc.DialHTTP("tcp", address, 0)
+	return srpc.DialHTTPWithDialer("tcp", address, rrDialer)
 }
 
 func dialHypervisor(address string) (*srpc.Client, error) {

cmd/vm-control/discardVmOldImage.go

@@ -3,19 +3,17 @@ package main
 import (
 	"fmt"
 	"net"
-	"os"
 
 	"github.com/Symantec/Dominator/lib/errors"
 	"github.com/Symantec/Dominator/lib/log"
 	proto "github.com/Symantec/Dominator/proto/hypervisor"
 )
 
-func discardVmOldImageSubcommand(args []string, logger log.DebugLogger) {
+func discardVmOldImageSubcommand(args []string, logger log.DebugLogger) error {
 	if err := discardVmOldImage(args[0], logger); err != nil {
-		fmt.Fprintf(os.Stderr, "Error discarding VM old image: %s\n", err)
-		os.Exit(1)
+		return fmt.Errorf("Error discarding VM old image: %s", err)
 	}
-	os.Exit(0)
+	return nil
 }
 
 func discardVmOldImage(vmHostname string, logger log.DebugLogger) error {

cmd/vm-control/discardVmOldUserData.go

@@ -3,19 +3,18 @@ package main
 import (
 	"fmt"
 	"net"
-	"os"
 
 	"github.com/Symantec/Dominator/lib/errors"
 	"github.com/Symantec/Dominator/lib/log"
 	proto "github.com/Symantec/Dominator/proto/hypervisor"
 )
 
-func discardVmOldUserDataSubcommand(args []string, logger log.DebugLogger) {
+func discardVmOldUserDataSubcommand(args []string,
+	logger log.DebugLogger) error {
 	if err := discardVmOldUserData(args[0], logger); err != nil {
-		fmt.Fprintf(os.Stderr, "Error discarding VM old user data: %s\n", err)
-		os.Exit(1)
+		return fmt.Errorf("Error discarding VM old user data: %s", err)
 	}
-	os.Exit(0)
+	return nil
 }
 
 func discardVmOldUserData(vmHostname string, logger log.DebugLogger) error {

cmd/vm-control/discardVmSnapshot.go

@@ -3,19 +3,17 @@ package main
 import (
 	"fmt"
 	"net"
-	"os"
 
 	"github.com/Symantec/Dominator/lib/errors"
 	"github.com/Symantec/Dominator/lib/log"
 	proto "github.com/Symantec/Dominator/proto/hypervisor"
 )
 
-func discardVmSnapshotSubcommand(args []string, logger log.DebugLogger) {
+func discardVmSnapshotSubcommand(args []string, logger log.DebugLogger) error {
 	if err := discardVmSnapshot(args[0], logger); err != nil {
-		fmt.Fprintf(os.Stderr, "Error discarding VM snapshot: %s\n", err)
-		os.Exit(1)
+		return fmt.Errorf("Error discarding VM snapshot: %s", err)
 	}
-	os.Exit(0)
+	return nil
 }
 
 func discardVmSnapshot(vmHostname string, logger log.DebugLogger) error {

cmd/vm-control/findHypervisor.go

@@ -13,7 +13,7 @@ import (
 func findHypervisor(vmIpAddr net.IP) (string, error) {
 	if *fleetManagerHostname != "" {
 		cm := fmt.Sprintf("%s:%d", *fleetManagerHostname, *fleetManagerPortNum)
-		client, err := srpc.DialHTTP("tcp", cm, time.Second*10)
+		client, err := dialFleetManager(cm)
 		if err != nil {
 			return "", err
 		}

cmd/vm-control/getVmInfo.go

@@ -12,12 +12,11 @@ import (
 	proto "github.com/Symantec/Dominator/proto/hypervisor"
 )
 
-func getVmInfoSubcommand(args []string, logger log.DebugLogger) {
+func getVmInfoSubcommand(args []string, logger log.DebugLogger) error {
 	if err := getVmInfo(args[0], logger); err != nil {
-		fmt.Fprintf(os.Stderr, "Error getting VM info: %s\n", err)
-		os.Exit(1)
+		return fmt.Errorf("Error getting VM info: %s", err)
 	}
-	os.Exit(0)
+	return nil
 }
 
 func getVmInfo(vmHostname string, logger log.DebugLogger) error {

cmd/vm-control/getVmUserData.go

@@ -13,12 +13,11 @@ import (
 	proto "github.com/Symantec/Dominator/proto/hypervisor"
 )
 
-func getVmUserDataSubcommand(args []string, logger log.DebugLogger) {
+func getVmUserDataSubcommand(args []string, logger log.DebugLogger) error {
 	if err := getVmUserData(args[0], logger); err != nil {
-		fmt.Fprintf(os.Stderr, "Error getting VM user data: %s\n", err)
-		os.Exit(1)
+		return fmt.Errorf("Error getting VM user data: %s", err)
 	}
-	os.Exit(0)
+	return nil
 }
 
 func getVmUserData(vmHostname string, logger log.DebugLogger) error {

cmd/vm-control/getVmVolume.go

@@ -12,12 +12,11 @@ import (
 	proto "github.com/Symantec/Dominator/proto/hypervisor"
 )
 
-func getVmVolumeSubcommand(args []string, logger log.DebugLogger) {
+func getVmVolumeSubcommand(args []string, logger log.DebugLogger) error {
 	if err := getVmVolume(args[0], logger); err != nil {
-		fmt.Fprintf(os.Stderr, "Error getting VM volume: %s\n", err)
-		os.Exit(1)
+		return fmt.Errorf("Error getting VM volume: %s", err)
 	}
-	os.Exit(0)
+	return nil
 }
 
 func getVmVolume(vmHostname string, logger log.DebugLogger) error {

cmd/vm-control/importLocalVm.go

@@ -82,12 +82,11 @@ func commitVm(client *srpc.Client, ipAddress net.IP) error {
 	return errors.New(reply.Error)
 }
 
-func importLocalVmSubcommand(args []string, logger log.DebugLogger) {
+func importLocalVmSubcommand(args []string, logger log.DebugLogger) error {
 	if err := importLocalVm(args[0], args[1], logger); err != nil {
-		fmt.Fprintf(os.Stderr, "Error importing VM: %s\n", err)
-		os.Exit(1)
+		return fmt.Errorf("Error importing VM: %s", err)
 	}
-	os.Exit(0)
+	return nil
 }
 
 func importLocalVm(infoFile, rootVolume string, logger log.DebugLogger) error {

cmd/vm-control/importVirshVm.go

@@ -66,12 +66,11 @@ type volumeType struct {
 	Type   string     `xml:"type,attr"`
 }
 
-func importVirshVmSubcommand(args []string, logger log.DebugLogger) {
+func importVirshVmSubcommand(args []string, logger log.DebugLogger) error {
 	if err := importVirshVm(args[0], args[1], logger); err != nil {
-		fmt.Fprintf(os.Stderr, "Error importing VM: %s\n", err)
-		os.Exit(1)
+		return fmt.Errorf("Error importing VM: %s", err)
 	}
-	os.Exit(0)
+	return nil
 }
 
 func ensureDomainIsStopped(domainName string) error {