fix(region): change storage_size from int to int64 (#19085)

yunionio · Dec 22, 2023 · 5ed79e2 · 5ed79e2
1 parent d9190bc
commit 5ed79e2
Show file tree

Hide file tree

Showing 29 changed files with 39 additions and 39 deletions.
diff --git a/go.mod b/go.mod
@@ -88,7 +88,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.20231222082642-2717001c0240
+	yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231222093526-d35740f80896
 	yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32
 	yunion.io/x/jsonutils v1.0.1-0.20230613121553-0f3b41e2ef19
 	yunion.io/x/log v1.0.1-0.20230411060016-feb3f46ab361

diff --git a/go.sum b/go.sum
@@ -1201,8 +1201,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.20231222082642-2717001c0240 h1:gxeXGwyuXRWOETJ3KChKXb5BD0I+OTvgUenJNoJowFI=
-yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231222082642-2717001c0240/go.mod h1:aj1gR9PPb6eqqKOwvANe26CoZFY8ydmXy0fuvgKYXH0=
+yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231222093526-d35740f80896 h1:+mqvBWP2GaX13HhZlfbqZ1xX2T9Fl1OWm4Qx7TYmqgU=
+yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231222093526-d35740f80896/go.mod h1:aj1gR9PPb6eqqKOwvANe26CoZFY8ydmXy0fuvgKYXH0=
 yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32 h1:v7POYkQwo1XzOxBoIoRVr/k0V9Y5JyjpshlIFa9raug=
 yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32/go.mod h1:Uxuou9WQIeJXNpy7t2fPLL0BYLvLiMvGQwY7Qc6aSws=
 yunion.io/x/jsonutils v0.0.0-20190625054549-a964e1e8a051/go.mod h1:4N0/RVzsYL3kH3WE/H1BjUQdFiWu50JGCFQuuy+Z634=

diff --git a/pkg/apis/compute/zz_generated.model.go b/pkg/apis/compute/zz_generated.model.go
diff --git a/pkg/compute/models/host_recycle.go b/pkg/compute/models/host_recycle.go
@@ -120,12 +120,12 @@ func (self *SGuest) doPrepaidRecycleNoLock(ctx context.Context, userCred mcclien
 	guestdisks, _ := self.GetGuestDisks()
 
 	storageInfo := make([]baremetal.BaremetalStorage, 0)
-	totalSize := 0
+	totalSize := int64(0)
 	for i := 0; i < len(guestdisks); i += 1 {
 		disk := guestdisks[i].GetDisk()
 		storage, _ := disk.GetStorage()
 
-		totalSize += disk.DiskSize
+		totalSize += int64(disk.DiskSize)
 
 		if len(fakeHost.StorageType) == 0 {
 			fakeHost.StorageType = storage.StorageType

diff --git a/pkg/compute/models/hosts.go b/pkg/compute/models/hosts.go
@@ -150,7 +150,7 @@ type SHost struct {
 	PageSizeKB int `nullable:"false" default:"4" list:"domain" update:"domain" create:"domain_optional"`
 
 	// 存储大小,单位Mb
-	StorageSize int `nullable:"true" list:"domain" update:"domain" create:"domain_optional"`
+	StorageSize int64 `nullable:"true" list:"domain" update:"domain" create:"domain_optional"`
 	// 存储类型
 	StorageType string `width:"20" charset:"ascii" nullable:"true" list:"domain" update:"domain" create:"domain_optional"`
 	// 存储驱动类型

diff --git a/pkg/mcclient/cloudpods/host.go b/pkg/mcclient/cloudpods/host.go
@@ -153,7 +153,7 @@ func (host *SHost) GetReservedMemoryMb() int {
 	return host.MemReserved
 }
 
-func (host *SHost) GetStorageSizeMB() int {
+func (host *SHost) GetStorageSizeMB() int64 {
 	return host.StorageSize
 }
 

diff --git a/vendor/modules.txt b/vendor/modules.txt
@@ -1465,7 +1465,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.20231222082642-2717001c0240
+# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20231222093526-d35740f80896
 ## 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/cloudprovider/resources.go b/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/resources.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/host.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/host.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/host.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/host.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/node.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/node.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/host.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ecloud/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ecloud/host.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/host.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/host.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/host.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/host.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/host.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/host.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/hypervisor.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/hypervisor.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/host.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/host.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/host.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/host.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ucloud/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ucloud/host.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/host.go
diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/host.go