Also parse the available, in addition to the total

Author: afbjorklund

pkg/minikube/machine/info.go

@@ -81,7 +81,7 @@ func RemoteHostInfo(r command.Runner) (*HostInfo, error, error, error) {
 		klog.Warningf("Unable to get mem info: %v", memErr)
 	}
 	free := rr.Stdout.String()
-	memory, err := util.ParseMemFree(free)
+	memory, _, err := util.ParseMemFree(free)
 	if err != nil {
 		klog.Warningf("Unable to parse mem info: %v", err)
 	}
@@ -90,7 +90,7 @@ func RemoteHostInfo(r command.Runner) (*HostInfo, error, error, error) {
 		klog.Warningf("Unable to get disk info: %v", diskErr)
 	}
 	df := rr.Stdout.String()
-	disksize, err := util.ParseDiskFree(df)
+	disksize, _, err := util.ParseDiskFree(df)
 	if err != nil {
 		klog.Warningf("Unable to parse disk info: %v", err)
 	}

pkg/util/utils.go

@@ -64,7 +64,8 @@ func ConvertUnsignedBytesToMB(byteSize uint64) int64 {
 }
 
 // ParseMemFree parses the output of the `free -m` command
-func ParseMemFree(out string) (int64, error) {
+// returns: total, available
+func ParseMemFree(out string) (int64, int64, error) {
 	//             total        used        free      shared  buff/cache   available
 	//Mem:           1987         706         194           1        1086        1173
 	//Swap:             0           0           0
@@ -74,18 +75,23 @@ func ParseMemFree(out string) (int64, error) {
 		parsedLine := strings.Fields(line)
 		t, err := strconv.ParseInt(parsedLine[1], 10, 64)
 		if err != nil {
-			return 0, err
+			return 0, 0, err
+		}
+		a, err := strconv.ParseInt(parsedLine[6], 10, 64)
+		if err != nil {
+			return 0, 0, err
 		}
 		m := strings.Trim(parsedLine[0], ":")
 		if m == "Mem" {
-			return t, nil
+			return t, a, nil
 		}
 	}
-	return 0, nil
+	return 0, 0, nil
 }
 
 // ParseDiskFree parses the output of the `df -m` command
-func ParseDiskFree(out string) (int64, error) {
+// returns: total, available
+func ParseDiskFree(out string) (int64, int64, error) {
 	// Filesystem     1M-blocks  Used Available Use% Mounted on
 	// /dev/sda1          39643  3705     35922  10% /
 	outlines := strings.Split(out, "\n")
@@ -94,14 +100,18 @@ func ParseDiskFree(out string) (int64, error) {
 		parsedLine := strings.Fields(line)
 		t, err := strconv.ParseInt(parsedLine[1], 10, 64)
 		if err != nil {
-			return 0, err
+			return 0, 0, err
+		}
+		a, err := strconv.ParseInt(parsedLine[3], 10, 64)
+		if err != nil {
+			return 0, 0, err
 		}
 		m := parsedLine[5]
 		if m == "/" {
-			return t, nil
+			return t, a, nil
 		}
 	}
-	return 0, nil
+	return 0, 0, nil
 }
 
 // GetBinaryDownloadURL returns a suitable URL for the platform