disk GB fix && make fmt

pkg/compute/guestdrivers/aws.go

@@ -3,7 +3,7 @@ package guestdrivers
 import (
 	"context"
 	"fmt"
-    "strings"
+	"strings"
 	"time"
 
 	"yunion.io/x/jsonutils"
@@ -26,32 +26,32 @@ func init() {
 }
 
 func fetchAwsUserName(desc cloudprovider.SManagedVMCreateConfig) string {
-    // 非公有云官方镜像
-    if desc.ImageType != "system" {
-        return "root"
-    }
+	// 非公有云官方镜像
+	if desc.ImageType != "system" {
+		return "root"
+	}
 
-    // 公有云官方镜像
-    dist := strings.ToLower(desc.OsDistribution)
-    if strings.Contains(dist, "centos") {
-        return "centos"
-    } else if strings.Contains(dist, "ubuntu") {
-        return "ubuntu"
-    } else if strings.Contains(dist, "windows") {
-        return "Administrator"
-    } else if strings.Contains(dist, "debian") {
-        return "admin"
-    } else if strings.Contains(dist, "suse") {
-        return "ec2-user"
-    } else if strings.Contains(dist, "fedora") {
-        return "ec2-user"
-    } else if strings.Contains(dist, "rhel") || strings.Contains(dist, "redhat")  {
-        return "ec2-user"
-    } else if strings.Contains(dist, "amazon linux") {
-        return "ec2-user"
-    } else {
-        return "ec2-user"
-    }
+	// 公有云官方镜像
+	dist := strings.ToLower(desc.OsDistribution)
+	if strings.Contains(dist, "centos") {
+		return "centos"
+	} else if strings.Contains(dist, "ubuntu") {
+		return "ubuntu"
+	} else if strings.Contains(dist, "windows") {
+		return "Administrator"
+	} else if strings.Contains(dist, "debian") {
+		return "admin"
+	} else if strings.Contains(dist, "suse") {
+		return "ec2-user"
+	} else if strings.Contains(dist, "fedora") {
+		return "ec2-user"
+	} else if strings.Contains(dist, "rhel") || strings.Contains(dist, "redhat") {
+		return "ec2-user"
+	} else if strings.Contains(dist, "amazon linux") {
+		return "ec2-user"
+	} else {
+		return "ec2-user"
+	}
 }
 
 func (self *SAwsGuestDriver) GetHypervisor() string {
@@ -153,7 +153,7 @@ func (self *SAwsGuestDriver) RequestDeployGuestOnHost(ctx context.Context, guest
 		return err
 	}
 
-    username := fetchAwsUserName(desc)
+	username := fetchAwsUserName(desc)
 
 	switch action {
 	case "create":

pkg/util/huawei/storagecache.go

@@ -3,6 +3,7 @@ package huawei
 import (
 	"context"
 	"fmt"
+	"math"
 	"strings"
 	"time"
 
@@ -178,7 +179,8 @@ func (self *SStoragecache) uploadImage(ctx context.Context, userCred mcclient.To
 		return "", err
 	}
 
-	minDiskGB, _ := _image.Int("min_disk")
+	minDiskMB, _ := _image.Int("min_disk")
+	minDiskGB := int(math.Ceil(float64(minDiskMB) / 1024))
 	// 在使用OBS桶的外部镜像文件制作镜像时生效且为必选字段。取值为40～1024GB。
 	if minDiskGB < 40 {
 		minDiskGB = 40

pkg/util/imagetools/imagetools.go

@@ -40,9 +40,9 @@ func normalizeOsDistribution(osDist string, imageName string) string {
 	osDist = strings.ToLower(osDist)
 	if strings.Contains(osDist, "centos") {
 		return "CentOS"
-    } else if strings.Contains(osDist, "redhat") || strings.Contains(osDist, "rhel") {
-	    return "RHEL"
-    } else if strings.Contains(osDist, "ubuntu") {
+	} else if strings.Contains(osDist, "redhat") || strings.Contains(osDist, "rhel") {
+		return "RHEL"
+	} else if strings.Contains(osDist, "ubuntu") {
 		return "Ubuntu"
 	} else if strings.Contains(osDist, "suse") {
 		return "SUSE"