govc: add volume.extend command

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

Author: dougm

cli/volume/extend.go

@@ -0,0 +1,85 @@
+// © Broadcom. All Rights Reserved.
+// The term “Broadcom” refers to Broadcom Inc. and/or its subsidiaries.
+// SPDX-License-Identifier: Apache-2.0
+
+package volume
+
+import (
+	"context"
+	"errors"
+	"flag"
+
+	"github.com/vmware/govmomi/cli"
+	"github.com/vmware/govmomi/cli/flags"
+	"github.com/vmware/govmomi/cns"
+	"github.com/vmware/govmomi/cns/types"
+	"github.com/vmware/govmomi/units"
+)
+
+type extend struct {
+	*flags.ClientFlag
+
+	size units.ByteSize
+}
+
+func init() {
+	cli.Register("volume.extend", &extend{})
+}
+
+func (cmd *extend) Register(ctx context.Context, f *flag.FlagSet) {
+	cmd.ClientFlag, ctx = flags.NewClientFlag(ctx)
+	cmd.ClientFlag.Register(ctx, f)
+
+	f.Var(&cmd.size, "size", "New size of new volume")
+}
+
+func (cmd *extend) Usage() string {
+	return "ID"
+}
+
+func (cmd *extend) Description() string {
+	return `Extend CNS volume.
+
+Examples:
+  govc volume.extend -size 10GB f75989dc-95b9-4db7-af96-8583f24bc59d`
+}
+
+func (cmd *extend) Run(ctx context.Context, f *flag.FlagSet) error {
+	if f.NArg() != 1 {
+		return flag.ErrHelp
+	}
+
+	c, err := cmd.CnsClient()
+	if err != nil {
+		return err
+	}
+
+	spec := []types.CnsVolumeExtendSpec{{
+		VolumeId: types.CnsVolumeId{
+			Id: f.Arg(0),
+		},
+		CapacityInMb: int64(cmd.size) / units.MB,
+	}}
+
+	task, err := c.ExtendVolume(ctx, spec)
+	if err != nil {
+		return err
+	}
+
+	info, err := cns.GetTaskInfo(ctx, task)
+	if err != nil {
+		return err
+	}
+
+	res, err := cns.GetTaskResult(ctx, info)
+	if err != nil {
+		return err
+	}
+
+	fault := res.GetCnsVolumeOperationResult().Fault
+	if fault != nil {
+		return errors.New(fault.LocalizedMessage)
+	}
+
+	return nil
+}

cns/simulator/simulator.go

@@ -473,27 +473,30 @@ func (m *CnsVolumeManager) CnsDetachVolume(ctx *simulator.Context, req *cnstypes
 // CnsExtendVolume simulates ExtendVolume call for simulated vc
 func (m *CnsVolumeManager) CnsExtendVolume(ctx *simulator.Context, req *cnstypes.CnsExtendVolume) soap.HasFault {
 	task := simulator.CreateTask(m, "CnsExtendVolume", func(task *simulator.Task) (vim25types.AnyType, vim25types.BaseMethodFault) {
-		if len(req.ExtendSpecs) == 0 {
-			return nil, &vim25types.InvalidArgument{InvalidProperty: "CnsExtendVolumeSpec"}
+		if len(req.ExtendSpecs) != 1 {
+			return nil, &vim25types.InvalidArgument{InvalidProperty: "InputSpec"} // Same as real VC, currently
 		}
-		operationResult := []cnstypes.BaseCnsVolumeOperationResult{}
 
-		for _, extendSpecs := range req.ExtendSpecs {
-			for _, dsVolumes := range m.volumes {
-				for id, volume := range dsVolumes {
-					if id.Id == extendSpecs.VolumeId.Id {
-						volume.BackingObjectDetails.GetCnsBackingObjectDetails().CapacityInMb = extendSpecs.CapacityInMb
-						operationResult = append(operationResult, &cnstypes.CnsVolumeOperationResult{
-							VolumeId: volume.VolumeId,
-						})
-						break
-					}
-				}
+		found := false
+		spec := req.ExtendSpecs[0]
+		res := cnstypes.CnsVolumeOperationResult{
+			VolumeId: spec.VolumeId,
+		}
+
+		for _, volumes := range m.volumes {
+			if volume, ok := volumes[spec.VolumeId]; ok {
+				found = true
+				volume.BackingObjectDetails.GetCnsBackingObjectDetails().CapacityInMb = spec.CapacityInMb
+				break
 			}
 		}
 
+		if !found {
+			res.Fault = &vim25types.LocalizedMethodFault{Fault: new(vim25types.NotFound)}
+		}
+
 		return &cnstypes.CnsVolumeOperationBatchResult{
-			VolumeResults: operationResult,
+			VolumeResults: []cnstypes.BaseCnsVolumeOperationResult{&res},
 		}, nil
 	})
 

govc/USAGE.md

@@ -430,6 +430,7 @@ but appear via `govc $cmd -h`:
  - [vm.unregister](#vmunregister)
  - [vm.upgrade](#vmupgrade)
  - [vm.vnc](#vmvnc)
+ - [volume.extend](#volumeextend)
  - [volume.ls](#volumels)
  - [volume.rm](#volumerm)
  - [volume.snapshot.create](#volumesnapshotcreate)
@@ -7633,6 +7634,20 @@ Options:
   -port-range=5900-5999  VNC port auto-select range
 ```
 
+## volume.extend
+
+```
+Usage: govc volume.extend [OPTIONS] ID
+
+Extend CNS volume.
+
+Examples:
+  govc volume.extend -size 10GB f75989dc-95b9-4db7-af96-8583f24bc59d
+
+Options:
+  -size=0B               New size of new volume
+```
+
 ## volume.ls
 
 ```

govc/test/volume.bats

@@ -117,11 +117,17 @@ load test_helper
   run govc volume.ls "$vol"
   assert_success
 
+  run govc volume.extend -size 20M "$id"
+  assert_success
+
   run govc volume.rm "$vol"
   assert_success
 
   run govc disk.ls "$id"
   assert_failure
+
+  run govc volume.extend -size 30M "$id"
+  assert_failure
 }
 
 @test "volume.rm" {