Merge 9d3a9e7 into 2b47638

pkg/image/filefmt.go

@@ -46,6 +46,30 @@ var knownHeaders = Headers{
 		SizeOff: 0,
 		SizeLen: 0,
 	},
+	"vmdk": Header{
+		Format:      "vmdk",
+		magicNumber: []byte{0x4B, 0x44, 0x4D, 0x56},
+		SizeOff:     0,
+		SizeLen:     0,
+	},
+	"vdi": Header{
+		Format:      "vdi",
+		magicNumber: []byte{0x3C, 0x3C, 0x3C, 0x20},
+		SizeOff:     0,
+		SizeLen:     0,
+	},
+	"vhd": Header{
+		Format:      "vhd",
+		magicNumber: []byte{0x63, 0x6F, 0x6E, 0x6E, 0x65, 0x63, 0x74, 0x69, 0x78},
+		SizeOff:     0,
+		SizeLen:     0,
+	},
+	"vhdx": Header{
+		Format:      "vhdx",
+		magicNumber: []byte{0x76, 0x68, 0x64, 0x78, 0x66, 0x69, 0x6C, 0x65},
+		SizeOff:     0,
+		SizeLen:     0,
+	},
 }
 
 // Header represents our parameters for a file format header

pkg/image/filefmt_test.go

@@ -60,6 +60,14 @@ var _ = Describe("File format tests", func() {
 			fields{"gz", []byte{0x1F, 0x8B}, 0, 0, 0},
 			[]byte{'Q', 'F', 'I', 0xfb},
 			false),
+		table.Entry("match vmdk",
+			fields{"vmdk", []byte{0x4B, 0x44, 0x4D, 0x56}, 0, 24, 8},
+			[]byte{0x4B, 0x44, 0x4D, 0x56},
+			true),
+		table.Entry("match vdi",
+			fields{"vdi", []byte{0x3C, 0x3C, 0x3C, 0x20}, 0, 24, 8},
+			[]byte{0x3C, 0x3C, 0x3C, 0x20},
+			true),
 	)
 
 	tokenQcow := make([]byte, 20)

pkg/image/qemu.go

@@ -195,7 +195,7 @@ func (o *qemuOperations) Info(url *url.URL) (*ImgInfo, error) {
 
 func isSupportedFormat(value string) bool {
 	switch value {
-	case "raw", "qcow2":
+	case "raw", "qcow2", "vmdk", "vdi", "vpc", "vhdx":
 		return true
 	default:
 		return false

pkg/image/validate.go

@@ -9,6 +9,14 @@ const (
 	ExtGz = ".gz"
 	// ExtQcow2 is a constant for the .qcow2 extenstion
 	ExtQcow2 = ".qcow2"
+	// ExtVmdk is a constant for the .vmdk VMware extenstion
+	ExtVmdk = ".vmdk"
+	// ExtVdi is a constant for the .vdi VirtualBox extenstion
+	ExtVdi = ".vdi"
+	// ExtVhd is a constant for the .vhd Microsoft Virtual Server Virtual Hard Disk extenstion
+	ExtVhd = ".vhd"
+	// ExtVhdx is a constant for the .vhd Hyper-V Virtual Hard Disk V.2 extenstion
+	ExtVhdx = ".vhdx"
 	// ExtTar is a constant for the .tar extenstion
 	ExtTar = ".tar"
 	// ExtXz is a constant for the .xz extenstion

pkg/importer/format-readers.go

@@ -178,6 +178,18 @@ func (fr *FormatReaders) fileFormatSelector(hdr *image.Header) {
 			fr.Archived = true
 			fr.ArchiveXz = true
 		}
+	case "vmdk":
+		r = nil
+		fr.Convert = true
+	case "vdi":
+		r = nil
+		fr.Convert = true
+	case "vhd":
+		r = nil
+		fr.Convert = true
+	case "vhdx":
+		r = nil
+		fr.Convert = true
 	}
 	if err == nil && r != nil {
 		fr.appendReader(rdrTypM[fFmt], r)

tests/datavolume_test.go

@@ -54,6 +54,18 @@ var _ = Describe("[vendor:cnv-qe@redhat.com][level:component]DataVolume tests",
 	httpsTinyCoreQcow2URL := func() string {
 		return fmt.Sprintf(utils.HTTPSTinyCoreQcow2URL, f.CdiInstallNs)
 	}
+	httpsTinyCoreVmdkURL := func() string {
+		return fmt.Sprintf(utils.HTTPSTinyCoreVmdkURL, f.CdiInstallNs)
+	}
+	httpsTinyCoreVdiURL := func() string {
+		return fmt.Sprintf(utils.HTTPSTinyCoreVdiURL, f.CdiInstallNs)
+	}
+	httpsTinyCoreVhdURL := func() string {
+		return fmt.Sprintf(utils.HTTPSTinyCoreVhdURL, f.CdiInstallNs)
+	}
+	httpsTinyCoreVhdxURL := func() string {
+		return fmt.Sprintf(utils.HTTPSTinyCoreVhdxURL, f.CdiInstallNs)
+	}
 	tinyCoreQcow2URL := func() string {
 		return fmt.Sprintf(utils.TinyCoreQcow2URL+".gz", f.CdiInstallNs)
 	}
@@ -572,6 +584,102 @@ var _ = Describe("[vendor:cnv-qe@redhat.com][level:component]DataVolume tests",
 					Message: "Import Complete",
 					Reason:  "Completed",
 				}}),
+			table.Entry("succeed creating import dv with given valid vmdk url (https)", dataVolumeTestArguments{
+				name:             "dv-https-import-vmdk",
+				size:             "1Gi",
+				url:              httpsTinyCoreVmdkURL,
+				dvFunc:           createHTTPSDataVolume,
+				eventReason:      controller.ImportSucceeded,
+				phase:            cdiv1.Succeeded,
+				checkPermissions: true,
+				readyCondition: &cdiv1.DataVolumeCondition{
+					Type:   cdiv1.DataVolumeReady,
+					Status: v1.ConditionTrue,
+				},
+				boundCondition: &cdiv1.DataVolumeCondition{
+					Type:    cdiv1.DataVolumeBound,
+					Status:  v1.ConditionTrue,
+					Message: "PVC dv-https-import-vmdk Bound",
+					Reason:  "Bound",
+				},
+				runningCondition: &cdiv1.DataVolumeCondition{
+					Type:    cdiv1.DataVolumeRunning,
+					Status:  v1.ConditionFalse,
+					Message: "Import Complete",
+					Reason:  "Completed",
+				}}),
+			table.Entry("succeed creating import dv with given valid vdi url (https)", dataVolumeTestArguments{
+				name:             "dv-https-import-vdi",
+				size:             "1Gi",
+				url:              httpsTinyCoreVdiURL,
+				dvFunc:           createHTTPSDataVolume,
+				eventReason:      controller.ImportSucceeded,
+				phase:            cdiv1.Succeeded,
+				checkPermissions: true,
+				readyCondition: &cdiv1.DataVolumeCondition{
+					Type:   cdiv1.DataVolumeReady,
+					Status: v1.ConditionTrue,
+				},
+				boundCondition: &cdiv1.DataVolumeCondition{
+					Type:    cdiv1.DataVolumeBound,
+					Status:  v1.ConditionTrue,
+					Message: "PVC dv-https-import-vdi Bound",
+					Reason:  "Bound",
+				},
+				runningCondition: &cdiv1.DataVolumeCondition{
+					Type:    cdiv1.DataVolumeRunning,
+					Status:  v1.ConditionFalse,
+					Message: "Import Complete",
+					Reason:  "Completed",
+				}}),
+			table.Entry("succeed creating import dv with given valid vhd url (https)", dataVolumeTestArguments{
+				name:             "dv-https-import-vhd",
+				size:             "1Gi",
+				url:              httpsTinyCoreVhdURL,
+				dvFunc:           createHTTPSDataVolume,
+				eventReason:      controller.ImportSucceeded,
+				phase:            cdiv1.Succeeded,
+				checkPermissions: true,
+				readyCondition: &cdiv1.DataVolumeCondition{
+					Type:   cdiv1.DataVolumeReady,
+					Status: v1.ConditionTrue,
+				},
+				boundCondition: &cdiv1.DataVolumeCondition{
+					Type:    cdiv1.DataVolumeBound,
+					Status:  v1.ConditionTrue,
+					Message: "PVC dv-https-import-vhd Bound",
+					Reason:  "Bound",
+				},
+				runningCondition: &cdiv1.DataVolumeCondition{
+					Type:    cdiv1.DataVolumeRunning,
+					Status:  v1.ConditionFalse,
+					Message: "Import Complete",
+					Reason:  "Completed",
+				}}),
+			table.Entry("succeed creating import dv with given valid vhdx url (https)", dataVolumeTestArguments{
+				name:             "dv-https-import-vhdx",
+				size:             "1Gi",
+				url:              httpsTinyCoreVhdxURL,
+				dvFunc:           createHTTPSDataVolume,
+				eventReason:      controller.ImportSucceeded,
+				phase:            cdiv1.Succeeded,
+				checkPermissions: true,
+				readyCondition: &cdiv1.DataVolumeCondition{
+					Type:   cdiv1.DataVolumeReady,
+					Status: v1.ConditionTrue,
+				},
+				boundCondition: &cdiv1.DataVolumeCondition{
+					Type:    cdiv1.DataVolumeBound,
+					Status:  v1.ConditionTrue,
+					Message: "PVC dv-https-import-vhdx Bound",
+					Reason:  "Bound",
+				},
+				runningCondition: &cdiv1.DataVolumeCondition{
+					Type:    cdiv1.DataVolumeRunning,
+					Status:  v1.ConditionFalse,
+					Message: "Import Complete",
+					Reason:  "Completed",
+				}}),
 			table.Entry("[rfe_id:1111][crit:high][test_id:1361]succeed creating blank image dv", dataVolumeTestArguments{
 				name:             "blank-image-dv",
 				size:             "1Gi",

tests/utils/datavolume.go

@@ -39,6 +39,14 @@ const (
 	HTTPSTinyCoreQcow2URL = "https://cdi-file-host.%s/tinyCore.qcow2"
 	// TinyCoreQcow2URLRateLimit provides a test url for the tineyCore qcow2 image via rate-limiting proxy
 	TinyCoreQcow2URLRateLimit = "http://cdi-file-host.%s:82/tinyCore.qcow2"
+	// HTTPSTinyCoreVmdkURL provides a test url for the tineyCore qcow2 image
+	HTTPSTinyCoreVmdkURL = "https://cdi-file-host.%s/tinyCore.vmdk"
+	// HTTPSTinyCoreVdiURL provides a test url for the tineyCore qcow2 image
+	HTTPSTinyCoreVdiURL = "https://cdi-file-host.%s/tinyCore.vdi"
+	// HTTPSTinyCoreVhdURL provides a test url for the tineyCore qcow2 image
+	HTTPSTinyCoreVhdURL = "https://cdi-file-host.%s/tinyCore.vhd"
+	// HTTPSTinyCoreVhdxURL provides a test url for the tineyCore qcow2 image
+	HTTPSTinyCoreVhdxURL = "https://cdi-file-host.%s/tinyCore.vhdx"
 	// InvalidQcowImagesURL provides a test url for invalid qcow images
 	InvalidQcowImagesURL = "http://cdi-file-host.%s/invalid_qcow_images/"
 	// LargeVirtualDiskQcow provides a test url for a cirros image with a large virtual size, in qcow2 format

tests/utils/fileConversion.go

@@ -20,6 +20,10 @@ var formatTable = map[string]func(string, string) (string, error){
 	image.ExtXz:    toXz,
 	image.ExtTar:   toTar,
 	image.ExtQcow2: toQcow2,
+	image.ExtVmdk:  toVmdk,
+	image.ExtVdi:   toVdi,
+	image.ExtVhd:   toVhd,
+	image.ExtVhdx:  toVhdx,
 	"":             toNoop,
 }
 
@@ -141,6 +145,50 @@ func toQcow2(srcfile, tgtDir string) (string, error) {
 	return tgt, nil
 }
 
+func toVmdk(srcfile, tgtDir string) (string, error) {
+	base := strings.TrimSuffix(filepath.Base(srcfile), ".iso")
+	tgt := filepath.Join(tgtDir, base+image.ExtVmdk)
+	args := []string{"convert", "-f", "raw", "-O", "vmdk", srcfile, tgt}
+
+	if err := doCmdAndVerifyFile(tgt, "qemu-img", args...); err != nil {
+		return "", err
+	}
+	return tgt, nil
+}
+
+func toVdi(srcfile, tgtDir string) (string, error) {
+	base := strings.TrimSuffix(filepath.Base(srcfile), ".iso")
+	tgt := filepath.Join(tgtDir, base+image.ExtVdi)
+	args := []string{"convert", "-f", "raw", "-O", "vdi", srcfile, tgt}
+
+	if err := doCmdAndVerifyFile(tgt, "qemu-img", args...); err != nil {
+		return "", err
+	}
+	return tgt, nil
+}
+
+func toVhd(srcfile, tgtDir string) (string, error) {
+	base := strings.TrimSuffix(filepath.Base(srcfile), ".iso")
+	tgt := filepath.Join(tgtDir, base+image.ExtVhd)
+	args := []string{"convert", "-f", "raw", "-O", "vpc", srcfile, tgt}
+
+	if err := doCmdAndVerifyFile(tgt, "qemu-img", args...); err != nil {
+		return "", err
+	}
+	return tgt, nil
+}
+
+func toVhdx(srcfile, tgtDir string) (string, error) {
+	base := strings.TrimSuffix(filepath.Base(srcfile), ".iso")
+	tgt := filepath.Join(tgtDir, base+image.ExtVhdx)
+	args := []string{"convert", "-f", "raw", "-O", "vhdx", srcfile, tgt}
+
+	if err := doCmdAndVerifyFile(tgt, "qemu-img", args...); err != nil {
+		return "", err
+	}
+	return tgt, nil
+}
+
 func toNoop(src, tgtDir string) (string, error) {
 	return copyIfNotPresent(src, tgtDir)
 }

tools/cdi-func-test-file-host-init/main.go

@@ -45,6 +45,10 @@ func main() {
 		[]string{".gz"},
 		[]string{".xz"},
 		[]string{".qcow2"},
+		[]string{".vmdk"},
+		[]string{".vdi"},
+		[]string{".vhd"},
+		[]string{".vhdx"},
 		[]string{".qcow2", ".gz"},
 		[]string{".qcow2", ".xz"},
 	}