util: put ParseDiskSpec func to common

See coreos#3477 (comment)

mantle/kola/tests/rpmostree/deployments.go

@@ -39,7 +39,7 @@ func init() {
 		Run:         rpmOstreeInstallUninstall,
 		ClusterSize: 1,
 		Name:        "rpmostree.install-uninstall",
-		Description: "Verifies rpm-ostree supports installing and uninstalling rpms.",
+		Description: "Verify rpm-ostree supports installing and uninstalling rpms.",
 		Tags:        []string{"rpm-ostree", kola.NeedsInternetTag}, // these need network to retrieve bits
 		// this Ignition config lands the dummy RPM
 		UserData: conf.Ignition(`{

mantle/platform/api/gcloud/compute.go

@@ -35,28 +35,20 @@ func (a *API) vmname() string {
 	return fmt.Sprintf("%s-%x", a.options.BaseName, b)
 }
 
-// ["5G:interface=NVME"], by default the disk type is local-ssd
-func ParseDiskSpec(spec string, zone string) (*compute.AttachedDisk, error) {
-	split := strings.Split(spec, ":")
-	var diskinterface string
+// ["5G:channel=nvme"], by default the disk type is local-ssd
+func ParseDisk(spec string, zone string) (*compute.AttachedDisk, error) {
+	var diskmap map[string]string
 	var disksize string
-	if len(split) == 1 {
-		disksize = split[0]
-	} else if len(split) == 2 {
-		disksize = split[0]
-		for _, opt := range strings.Split(split[1], ",") {
-			if strings.HasPrefix(opt, "interface=") {
-				diskinterface = strings.TrimPrefix(opt, "interface=")
-				if diskinterface == "" || (diskinterface != "NVME" && diskinterface != "SCSI") {
-					return nil, fmt.Errorf("invalid interface opt %s", opt)
-				}
-			} else {
-				return nil, fmt.Errorf("unknown disk option %s", opt)
-			}
-		}
-	} else {
-		return nil, fmt.Errorf("invalid disk spec %s", spec)
+	var diskinterface string
+	var err error
+
+	if disksize, diskmap, err = util.ParseDiskSpec(spec); err != nil {
+		return nil, fmt.Errorf("failed to parse disk spec %s: %w", spec, err)
 	}
+	if value, found := diskmap["Channel"]; found {
+		diskinterface = strings.ToUpper(value)
+	}
+
 	disksize = strings.TrimSuffix(disksize, "G")
 	size, err := strconv.ParseInt(disksize, 10, 32)
 	if err != nil {
@@ -163,16 +155,15 @@ func (a *API) mkinstance(userdata, name string, keys []*agent.Key, opts platform
 		}
 	}
 	// attach aditional disk
-	if len(opts.AdditionalDisks) > 0 {
-		for _, spec := range opts.AdditionalDisks {
-			plog.Debugf("Parsing disk spec %q\n", spec)
-			disk, err := ParseDiskSpec(spec, a.options.Zone)
-			if err != nil {
-				return nil, fmt.Errorf("failed to parse spec %s: %w", spec, err)
-			}
-			instance.Disks = append(instance.Disks, disk)
+	for _, spec := range opts.AdditionalDisks {
+		plog.Debugf("Parsing disk spec %q\n", spec)
+		disk, err := ParseDisk(spec, a.options.Zone)
+		if err != nil {
+			return nil, fmt.Errorf("failed to parse spec %s: %w", spec, err)
 		}
+		instance.Disks = append(instance.Disks, disk)
 	}
+
 	return instance, nil
 }
 

mantle/platform/qemu.go

@@ -38,6 +38,7 @@ import (
 	"net"
 	"os"
 	"path/filepath"
+	"strconv"
 	"strings"
 	"syscall"
 	"time"
@@ -101,47 +102,35 @@ type Disk struct {
 	nbdServCmd     exec.Cmd // command to serve the disk
 }
 
-// ParseDiskSpec converts a disk specification into a Disk. The format is:
-// <size>[:<opt1>,<opt2>,...].
-func ParseDiskSpec(spec string) (*Disk, error) {
-	split := strings.Split(spec, ":")
-	var size string
+func ParseDisk(spec string) (*Disk, error) {
+	var diskmap map[string]string
+	var disksize string
 	var channel string
-	multipathed := false
-	sectorSize := 0
+	var sectorSize int64
 	serial_opt := []string{}
-	if len(split) == 1 {
-		size = split[0]
-	} else if len(split) == 2 {
-		size = split[0]
-		for _, opt := range strings.Split(split[1], ",") {
-			if opt == "mpath" {
-				multipathed = true
-			} else if opt == "4k" {
-				sectorSize = 4096
-			} else if strings.HasPrefix(opt, "channel=") {
-				channel = strings.TrimPrefix(opt, "channel=")
-				if channel == "" {
-					return nil, fmt.Errorf("invalid channel opt %s", opt)
-				}
-			} else if strings.HasPrefix(opt, "serial=") {
-				serial := strings.TrimPrefix(opt, "serial=")
-				if serial == "" {
-					return nil, fmt.Errorf("invalid serial opt %s", opt)
-				}
-				serial_opt = []string{"serial=" + serial}
-			} else {
-				return nil, fmt.Errorf("unknown disk option %s", opt)
-			}
-		}
-	} else {
-		return nil, fmt.Errorf("invalid disk spec %s", spec)
+	multipathed := false
+	var err error
+
+	if disksize, diskmap, err = util.ParseDiskSpec(spec); err != nil {
+		return nil, fmt.Errorf("failed to parse disk spec %s", spec)
+	}
+	if value, found := diskmap["Channel"]; found {
+		channel = value
+	}
+	if value, found := diskmap["SectorSize"]; found {
+		sectorSize, _ = strconv.ParseInt(value, 10, 32)
+	}
+	if value, found := diskmap["MultiPathDisk"]; found {
+		multipathed, _ = strconv.ParseBool(value)
+	}
+	if value, found := diskmap["DeviceOpts"]; found {
+		serial_opt = append(serial_opt, value)
 	}
 	return &Disk{
-		Size:          size,
+		Size:          disksize,
 		Channel:       channel,
 		DeviceOpts:    serial_opt,
-		SectorSize:    sectorSize,
+		SectorSize:    int(sectorSize),
 		MultiPathDisk: multipathed,
 	}, nil
 }
@@ -1225,7 +1214,7 @@ func (builder *QemuBuilder) AddDisk(disk *Disk) error {
 // AddDisksFromSpecs adds multiple secondary disks from their specs.
 func (builder *QemuBuilder) AddDisksFromSpecs(specs []string) error {
 	for _, spec := range specs {
-		if disk, err := ParseDiskSpec(spec); err != nil {
+		if disk, err := ParseDisk(spec); err != nil {
 			return errors.Wrapf(err, "parsing additional disk spec '%s'", spec)
 		} else if err = builder.AddDisk(disk); err != nil {
 			return errors.Wrapf(err, "adding additional disk '%s'", spec)

mantle/util/common.go

@@ -19,6 +19,7 @@ import (
 	"os"
 	"os/exec"
 	"path/filepath"
+	"strings"
 	"time"
 	"unsafe"
 
@@ -120,3 +121,43 @@ func RunCmdTimeout(timeout time.Duration, cmd string, args ...string) error {
 		return fmt.Errorf("%s timed out after %s", cmd, timeout)
 	}
 }
+
+// ParseDiskSpec converts a disk specification into a Disk. The format is:
+// <size>[:<opt1>,<opt2>,...], like ["5G:interface=NVME"]
+func ParseDiskSpec(spec string) (string, map[string]string, error) {
+	diskmap := map[string]string{}
+	split := strings.Split(spec, ":")
+	if split[0] == "" {
+		return "", nil, fmt.Errorf("invalid size %s", spec)
+	}
+	var disksize string
+	if len(split) == 1 {
+		disksize = split[0]
+	} else if len(split) == 2 {
+		disksize = split[0]
+		for _, opt := range strings.Split(split[1], ",") {
+			if opt == "mpath" {
+				diskmap["MultiPathDisk"] = "true"
+			} else if opt == "4k" {
+				diskmap["SectorSize"] = "4096"
+			} else if strings.HasPrefix(opt, "channel=") {
+				channel := strings.TrimPrefix(opt, "channel=")
+				if channel == "" {
+					return "", nil, fmt.Errorf("invalid channel opt %s", opt)
+				}
+				diskmap["Channel"] = channel
+			} else if strings.HasPrefix(opt, "serial=") {
+				serial := strings.TrimPrefix(opt, "serial=")
+				if serial == "" {
+					return "", nil, fmt.Errorf("invalid serial opt %s", opt)
+				}
+				diskmap["DeviceOpts"] = "serial=" + serial
+			} else {
+				return "", nil, fmt.Errorf("unknown disk option %s", opt)
+			}
+		}
+	} else {
+		return "", nil, fmt.Errorf("invalid disk spec %s", spec)
+	}
+	return disksize, diskmap, nil
+}