Merge pull request #2691 from prydin/prydin-exportsnap

Added vm::ExportSnapshot and snapshot flag to export.ovf

Author: dougm

govc/USAGE.md

@@ -1843,6 +1843,7 @@ Options:
   -name=                 Specifies target name (defaults to source name)
   -prefix=true           Prepend target name to image filenames if missing
   -sha=0                 Generate manifest using SHA 1, 256, 512 or 0 to skip
+  -snapshot=             Specifies a snapshot to export from (supports running VMs)
   -vm=                   Virtual machine [GOVC_VM]
 ```
 

govc/export/ovf.go

@@ -30,6 +30,8 @@ import (
 	"path/filepath"
 	"strings"
 
+	"github.com/vmware/govmomi/object"
+
 	"github.com/vmware/govmomi/govc/cli"
 	"github.com/vmware/govmomi/govc/flags"
 	"github.com/vmware/govmomi/nfc"
@@ -41,12 +43,13 @@ import (
 type ovfx struct {
 	*flags.VirtualMachineFlag
 
-	dest   string
-	name   string
-	force  bool
-	images bool
-	prefix bool
-	sha    int
+	dest     string
+	name     string
+	snapshot string
+	force    bool
+	images   bool
+	prefix   bool
+	sha      int
 
 	mf bytes.Buffer
 }
@@ -66,6 +69,7 @@ func (cmd *ovfx) Register(ctx context.Context, f *flag.FlagSet) {
 	cmd.VirtualMachineFlag.Register(ctx, f)
 
 	f.StringVar(&cmd.name, "name", "", "Specifies target name (defaults to source name)")
+	f.StringVar(&cmd.snapshot, "snapshot", "", "Specifies a snapshot to export from (supports running VMs)")
 	f.BoolVar(&cmd.force, "f", false, "Overwrite existing")
 	f.BoolVar(&cmd.images, "i", false, "Include image files (*.{iso,img})")
 	f.BoolVar(&cmd.prefix, "prefix", true, "Prepend target name to image filenames if missing")
@@ -129,7 +133,7 @@ func (cmd *ovfx) Run(ctx context.Context, f *flag.FlagSet) error {
 		return err
 	}
 
-	lease, err := vm.Export(ctx)
+	lease, err := cmd.requestExport(ctx, vm)
 	if err != nil {
 		return err
 	}
@@ -213,6 +217,17 @@ func (cmd *ovfx) Run(ctx context.Context, f *flag.FlagSet) error {
 	return file.Close()
 }
 
+func (cmd *ovfx) requestExport(ctx context.Context, vm *object.VirtualMachine) (*nfc.Lease, error) {
+	if cmd.snapshot != "" {
+		snapRef, err := vm.FindSnapshot(ctx, cmd.snapshot)
+		if err != nil {
+			return nil, err
+		}
+		return vm.ExportSnapshot(ctx, snapRef)
+	}
+	return vm.Export(ctx)
+}
+
 func (cmd *ovfx) include(item *nfc.FileItem) bool {
 	if cmd.images {
 		return true

object/virtual_machine.go

@@ -1063,3 +1063,16 @@ func (v VirtualMachine) QueryChangedDiskAreas(ctx context.Context, baseSnapshot,
 
 	return res.Returnval, nil
 }
+
+// ExportSnapshot exports all VMDK-files up to (but not including) a specified snapshot. This
+// is useful when exporting a running VM.
+func (v *VirtualMachine) ExportSnapshot(ctx context.Context, snapshot *types.ManagedObjectReference) (*nfc.Lease, error) {
+	req := types.ExportSnapshot{
+		This: *snapshot,
+	}
+	resp, err := methods.ExportSnapshot(ctx, v.Client(), &req)
+	if err != nil {
+		return nil, err
+	}
+	return nfc.NewLease(v.c, resp.Returnval), nil
+}