Merge pull request #3511 from dougm/issue-3483

fix: restore govc import.spec DiskProvisioning default value

Author: dougm

govc/test/import.bats

@@ -212,6 +212,25 @@ load test_helper
   grep "invalid NetworkMapping.Name" <<<"$output"
 }
 
+@test "import invalid disk provisioning" {
+  vcsim_env
+
+  ovf="$GOVC_IMAGES/$TTYLINUX_NAME.ovf"
+
+  spec=$(govc import.spec "$GOVC_IMAGES/$TTYLINUX_NAME.ovf")
+
+  options=$(jq ".DiskProvisioning = \"enoent\"" <<<"$spec")
+
+  run govc import.ovf -options - "$ovf" <<<"$options"
+  assert_failure "govc: Disk provisioning type not supported: enoent"
+
+  options=$(jq ".DiskProvisioning = \"monolithicSparse\"" <<<"$spec")
+
+  run govc import.ovf -options - "$ovf" <<<"$options"
+  assert_failure
+  assert_matches DeviceUnsupportedForVmPlatform
+}
+
 @test "import properties" {
   vcsim_env
 

ovf/importer/spec.go

@@ -99,9 +99,9 @@ func Spec(fpath string, a Archive, hidden, verbose bool) (*Options, error) {
 	}
 
 	o := Options{
-		DiskProvisioning:   allDiskProvisioningOptions[0],
-		IPAllocationPolicy: allIPAllocationPolicyOptions[0],
-		IPProtocol:         allIPProtocolOptions[0],
+		DiskProvisioning:   string(types.OvfCreateImportSpecParamsDiskProvisioningTypeFlat),
+		IPAllocationPolicy: string(types.VAppIPAssignmentInfoIpAllocationPolicyDhcpPolicy),
+		IPProtocol:         string(types.VAppIPAssignmentInfoProtocolsIPv4),
 		MarkAsTemplate:     false,
 		PowerOn:            false,
 		WaitForIP:          false,

simulator/ovf_manager.go

@@ -305,6 +305,28 @@ func (m *OvfManager) CreateImportSpec(ctx *Context, req *types.CreateImportSpec)
 			}
 			path.Path = fmt.Sprintf("%s/disk-%d.vmdk", req.Cisp.EntityName, ndisk)
 			d := device.CreateDisk(c.(types.BaseVirtualController), ds.Reference(), path.String())
+
+			switch types.OvfCreateImportSpecParamsDiskProvisioningType(req.Cisp.DiskProvisioning) {
+			case "",
+				types.OvfCreateImportSpecParamsDiskProvisioningTypeMonolithicFlat,
+				types.OvfCreateImportSpecParamsDiskProvisioningTypeFlat,
+				types.OvfCreateImportSpecParamsDiskProvisioningTypeEagerZeroedThick,
+				types.OvfCreateImportSpecParamsDiskProvisioningTypeThin,
+				types.OvfCreateImportSpecParamsDiskProvisioningTypeThick,
+				types.OvfCreateImportSpecParamsDiskProvisioningTypeSeSparse:
+				// OK
+			case types.OvfCreateImportSpecParamsDiskProvisioningTypeMonolithicSparse:
+				// results in DeviceUnsupportedForVmPlatform during import
+				d.VirtualDevice.Backing = new(types.VirtualDiskSparseVer2BackingInfo)
+			default:
+				result.Error = append(result.Error, types.LocalizedMethodFault{
+					Fault: &types.OvfUnsupportedDiskProvisioning{
+						DiskProvisioning: req.Cisp.DiskProvisioning,
+					},
+					LocalizedMessage: "Disk provisioning type not supported: " + req.Cisp.DiskProvisioning,
+				})
+			}
+
 			d.VirtualDevice.DeviceInfo = &types.Description{
 				Label: item.ElementName,
 			}

simulator/virtual_machine.go

@@ -1359,6 +1359,13 @@ func (vm *VirtualMachine) configureDevice(
 
 		summary = fmt.Sprintf("%s KB", numberToString(x.CapacityInKB, ','))
 		switch b := d.Backing.(type) {
+		case *types.VirtualDiskSparseVer2BackingInfo:
+			// Sparse disk creation not supported in ESX
+			return &types.DeviceUnsupportedForVmPlatform{
+				InvalidDeviceSpec: types.InvalidDeviceSpec{
+					InvalidVmConfig: types.InvalidVmConfig{Property: "VirtualDeviceSpec.device.backing"},
+				},
+			}
 		case types.BaseVirtualDeviceFileBackingInfo:
 			info := b.GetVirtualDeviceFileBackingInfo()
 			var path object.DatastorePath