govc: Add vm.disk.promote command

Signed-off-by: Doug MacEachern <[email protected]>

Author: dougm

cli/device/info.go

@@ -90,6 +90,22 @@ func match(p string, devices object.VirtualDeviceList) object.VirtualDeviceList
 	return matches
 }
 
+// Match returns devices where VirtualDeviceList.Name matches any of the strings in given args.
+// See also: path.Match, govc device.info, govc device.ls
+func Match(devices object.VirtualDeviceList, args []string) (object.VirtualDeviceList, error) {
+	var found object.VirtualDeviceList
+
+	for _, name := range args {
+		matches := match(name, devices)
+		if len(matches) == 0 {
+			return nil, fmt.Errorf("device '%s' not found", name)
+		}
+		found = append(found, matches...)
+	}
+
+	return found, nil
+}
+
 func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
 	vm, err := cmd.VirtualMachine()
 	if err != nil {
@@ -126,14 +142,12 @@ func (cmd *info) Run(ctx context.Context, f *flag.FlagSet) error {
 	if f.NArg() == 0 {
 		res.Devices = toInfoList(devices)
 	} else {
-		for _, name := range f.Args() {
-			matches := match(name, devices)
-			if len(matches) == 0 {
-				return fmt.Errorf("device '%s' not found", name)
-			}
-
-			res.Devices = append(res.Devices, toInfoList(matches)...)
+		devices, err = Match(devices, f.Args())
+		if err != nil {
+			return err
 		}
+
+		res.Devices = append(res.Devices, toInfoList(devices)...)
 	}
 
 	return cmd.WriteResult(&res)

cli/vm/disk/promote.go

@@ -0,0 +1,88 @@
+// © Broadcom. All Rights Reserved.
+// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
+// SPDX-License-Identifier: Apache-2.0
+
+package disk
+
+import (
+	"context"
+	"flag"
+
+	"github.com/vmware/govmomi/cli"
+	"github.com/vmware/govmomi/cli/device"
+	"github.com/vmware/govmomi/cli/flags"
+	"github.com/vmware/govmomi/vim25/types"
+)
+
+type promote struct {
+	*flags.VirtualMachineFlag
+
+	unlink bool
+}
+
+func init() {
+	cli.Register("vm.disk.promote", &promote{})
+}
+
+func (cmd *promote) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.VirtualMachineFlag, ctx = flags.NewVirtualMachineFlag(ctx)
+	cmd.VirtualMachineFlag.Register(ctx, f)
+
+	f.BoolVar(&cmd.unlink, "unlink", true, "Unlink")
+}
+
+func (cmd *promote) Usage() string {
+	return "DISK..."
+}
+
+func (cmd *promote) Description() string {
+	return `Promote VM disk.
+
+Examples:
+  govc device.info -vm $name disk-*
+  govc vm.disk.promote -vm $name disk-1000-0
+  govc vm.disk.promote -vm $name disk-*`
+}
+
+func (cmd *promote) Run(ctx context.Context, f *flag.FlagSet) error {
+	vm, err := cmd.VirtualMachine()
+	if err != nil {
+		return err
+	}
+
+	if vm == nil {
+		return flag.ErrHelp
+	}
+
+	if f.NArg() == 0 {
+		return flag.ErrHelp
+	}
+
+	devices, err := vm.Device(ctx)
+	if err != nil {
+		return err
+	}
+
+	devices = devices.SelectByType((*types.VirtualDisk)(nil))
+
+	devices, err = device.Match(devices, f.Args())
+	if err != nil {
+		return err
+	}
+
+	disks := make([]types.VirtualDisk, len(devices))
+	for i := range devices {
+		disks[i] = *(devices[i].(*types.VirtualDisk))
+	}
+
+	task, err := vm.PromoteDisks(ctx, cmd.unlink, disks)
+	if err != nil {
+		return err
+	}
+
+	logger := cmd.ProgressLogger("Promoting disks...")
+	defer logger.Wait()
+
+	_, err = task.WaitForResult(ctx, logger)
+	return err
+}

govc/USAGE.md

@@ -409,6 +409,7 @@ but appear via `govc $cmd -h`:
  - [vm.disk.attach](#vmdiskattach)
  - [vm.disk.change](#vmdiskchange)
  - [vm.disk.create](#vmdiskcreate)
+ - [vm.disk.promote](#vmdiskpromote)
  - [vm.guest.tools](#vmguesttools)
  - [vm.info](#vminfo)
  - [vm.instantclone](#vminstantclone)
@@ -7201,6 +7202,23 @@ Options:
   -vm=                   Virtual machine [GOVC_VM]
 ```
 
+## vm.disk.promote
+
+```
+Usage: govc vm.disk.promote [OPTIONS] DISK...
+
+Promote VM disk.
+
+Examples:
+  govc device.info -vm $name disk-*
+  govc vm.disk.promote -vm $name disk-1000-0
+  govc vm.disk.promote -vm $name disk-*
+
+Options:
+  -unlink=true           Unlink
+  -vm=                   Virtual machine [GOVC_VM]
+```
+
 ## vm.guest.tools
 
 ```