From b3427b954994ace5f92f5bfb07c70b66ef73c0f3 Mon Sep 17 00:00:00 2001
From: ioito <qu_xuan@icloud.com>
Date: Tue, 28 Feb 2023 19:45:45 +0800
Subject: [PATCH] fix(region): vmware template image size

---
 go.mod                                                     | 2 +-
 go.sum                                                     | 4 ++--
 vendor/modules.txt                                         | 2 +-
 .../yunion.io/x/cloudmux/pkg/multicloud/esxi/template.go   | 7 ++++---
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/go.mod b/go.mod
index 2354c462c9..c40cb80de2 100644
--- a/go.mod
+++ b/go.mod
@@ -83,7 +83,7 @@ require (
 	k8s.io/client-go v0.19.3
 	k8s.io/cluster-bootstrap v0.19.3
 	moul.io/http2curl/v2 v2.3.0
-	yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230224103233-7b0e7e7e76b6
+	yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230228114428-20e7bdb7be45
 	yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656
 	yunion.io/x/jsonutils v1.0.1-0.20220819091305-3bab322ab4fd
 	yunion.io/x/log v1.0.0
diff --git a/go.sum b/go.sum
index c2e50dc012..6221657ed9 100644
--- a/go.sum
+++ b/go.sum
@@ -1164,8 +1164,8 @@ sigs.k8s.io/structured-merge-diff/v4 v4.0.1/go.mod h1:bJZC9H9iH24zzfZ/41RGcq60oK
 sigs.k8s.io/yaml v1.1.0/go.mod h1:UJmg0vDUVViEyp3mgSv9WPwZCDxu4rQW1olrI1uml+o=
 sigs.k8s.io/yaml v1.2.0 h1:kr/MCeFWJWTwyaHoR9c8EjH9OumOmoF9YGiZd7lFm/Q=
 sigs.k8s.io/yaml v1.2.0/go.mod h1:yfXDCHCao9+ENCvLSE62v9VSji2MKu5jeNfTrofGhJc=
-yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230224103233-7b0e7e7e76b6 h1:z6WheXgjKgjvdjKHUFqlju1xLGtHujIN3Q+2rhcg9nQ=
-yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230224103233-7b0e7e7e76b6/go.mod h1:yEMFtIKPyIdIfPzsw7oTcH41JXc8G5StUAQw3ZoGj5I=
+yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230228114428-20e7bdb7be45 h1:O45uaLmag5nrQoO0sn8nkrLvG4yp+im/1QizinLnLM0=
+yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230228114428-20e7bdb7be45/go.mod h1:yEMFtIKPyIdIfPzsw7oTcH41JXc8G5StUAQw3ZoGj5I=
 yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656 h1:0zlZD5uhZoIHgLVAWCz2aHaYk2ZrNsACCYD7R6EIBII=
 yunion.io/x/executor v0.0.0-20211018100936-39a2cd966656/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
 yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=
diff --git a/vendor/modules.txt b/vendor/modules.txt
index c4d3975db1..d03630fd5d 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1442,7 +1442,7 @@ sigs.k8s.io/structured-merge-diff/v4/value
 # sigs.k8s.io/yaml v1.2.0
 ## explicit; go 1.12
 sigs.k8s.io/yaml
-# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230224103233-7b0e7e7e76b6
+# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20230228114428-20e7bdb7be45
 ## explicit; go 1.18
 yunion.io/x/cloudmux/pkg/apis
 yunion.io/x/cloudmux/pkg/apis/billing
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/template.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/template.go
index 6ea4291758..a46d808a28 100644
--- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/template.go
+++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/template.go
@@ -122,12 +122,13 @@ func (t *SVMTemplate) GetIStoragecache() cloudprovider.ICloudStoragecache {
 }
 
 func (t *SVMTemplate) GetSizeByte() int64 {
-	var sum int
 	for i := range t.vm.vdisks {
 		vdisk := t.vm.vdisks[i]
-		sum += vdisk.GetDiskSizeMB()
+		if vdisk.IsRoot {
+			return int64(vdisk.GetDiskSizeMB()) * (1 << 20)
+		}
 	}
-	return int64(sum) * (1 << 20)
+	return 0
 }
 
 func (t *SVMTemplate) GetImageType() cloudprovider.TImageType {