diff --git a/go.mod b/go.mod index f5f39e531e5..6339cd1dff5 100644 --- 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 index f71214b3c7d..47e7a8be05e 100644 --- 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 index 85e4a4eda83..216ad0e7656 100644 --- a/pkg/apis/compute/zz_generated.model.go +++ b/pkg/apis/compute/zz_generated.model.go @@ -1275,7 +1275,7 @@ type SHost struct { // 页大小 PageSizeKB int `json:"page_size_kb"` // 存储大小,单位Mb - StorageSize int `json:"storage_size"` + StorageSize int64 `json:"storage_size"` // 存储类型 StorageType string `json:"storage_type"` // 存储驱动类型 diff --git a/pkg/compute/models/host_recycle.go b/pkg/compute/models/host_recycle.go index dafe470d350..1ea09ff1517 100644 --- 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 index 6de48fa26f9..41fc647e533 100644 --- 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 index cd73c4835a6..a798ea195e1 100644 --- 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 index eac7b534e15..d212c0310f1 100644 --- 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 index 8762b93365d..b5add39734f 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/resources.go +++ b/vendor/yunion.io/x/cloudmux/pkg/cloudprovider/resources.go @@ -303,7 +303,7 @@ type ICloudHost interface { GetMemSizeMB() int GetMemCmtbound() float32 GetReservedMemoryMb() int - GetStorageSizeMB() int + GetStorageSizeMB() int64 GetStorageType() string GetHostType() string diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/host.go index 990dea0e55f..d26b5ab1829 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aliyun/host.go @@ -137,7 +137,7 @@ func (self *SHost) GetMemSizeMB() int { return 0 } -func (self *SHost) GetStorageSizeMB() int { +func (self *SHost) GetStorageSizeMB() int64 { return 0 } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/host.go index 2866e298f64..3f9f81572ef 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/apsara/host.go @@ -150,7 +150,7 @@ func (self *SHost) GetMemSizeMB() int { return 0 } -func (self *SHost) GetStorageSizeMB() int { +func (self *SHost) GetStorageSizeMB() int64 { return 0 } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/host.go index dfaf267f7a0..c5d55189f70 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/aws/host.go @@ -137,7 +137,7 @@ func (self *SHost) GetMemSizeMB() int { return 0 } -func (self *SHost) GetStorageSizeMB() int { +func (self *SHost) GetStorageSizeMB() int64 { return 0 } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/host.go index 92521f5bad8..59df7c49cb4 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/azure/host.go @@ -270,7 +270,7 @@ func (self *SHost) GetIVMById(instanceId string) (cloudprovider.ICloudVM, error) return instance, nil } -func (self *SHost) GetStorageSizeMB() int { +func (self *SHost) GetStorageSizeMB() int64 { return 0 } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/node.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/node.go index 9dcd360a3e7..7b5ce2b4b0c 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/node.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/bingocloud/node.go @@ -41,8 +41,8 @@ type SNode struct { CpuNode int CpuSockets int CpuUsed int - DiskMax int - DiskNode int + DiskMax int64 + DiskNode int64 DiskUsed int MemNode int MemoryMax int @@ -139,7 +139,7 @@ func (self *SNode) GetReservedMemoryMb() int { return 0 } -func (self *SNode) GetStorageSizeMB() int { +func (self *SNode) GetStorageSizeMB() int64 { if self.DiskMax > 0 { return self.DiskMax * 1024 } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/host.go index bc2f54fd029..cf52fba1785 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ctyun/host.go @@ -132,7 +132,7 @@ func (self *SHost) GetMemSizeMB() int { return 0 } -func (self *SHost) GetStorageSizeMB() int { +func (self *SHost) GetStorageSizeMB() int64 { return 0 } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ecloud/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ecloud/host.go index 13ef077659a..477135fde9a 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ecloud/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ecloud/host.go @@ -131,7 +131,7 @@ func (h *SHost) GetMemSizeMB() int { return 0 } -func (h *SHost) GetStorageSizeMB() int { +func (h *SHost) GetStorageSizeMB() int64 { return 0 } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/host.go index 57f3d766f16..36f03fc7b5c 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/host.go @@ -715,7 +715,7 @@ func (host *SHost) getStorages() []*SHostStorageAdapterInfo { return adapterList } -func (host *SHost) GetStorageSizeMB() int { +func (host *SHost) GetStorageSizeMB() int64 { storages, err := host.GetIStorages() if err != nil { log.Errorf("SHost.GetStorageSizeMB: SHost.GetIStorages: %s", err) @@ -725,7 +725,7 @@ func (host *SHost) GetStorageSizeMB() int { for _, stor := range storages { size += stor.GetCapacityMB() } - return int(size) + return size } func (host *SHost) GetStorageType() string { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/host.go index ba0fdee038b..f64fbb6c68f 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/google/host.go @@ -109,7 +109,7 @@ func (host *SHost) GetMemSizeMB() int { return 0 } -func (host *SHost) GetStorageSizeMB() int { +func (host *SHost) GetStorageSizeMB() int64 { return 0 } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/host.go index bdd27e6ae55..4b93397823e 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/hcso/host.go @@ -179,7 +179,7 @@ func (self *SHost) GetMemSizeMB() int { return 0 } -func (self *SHost) GetStorageSizeMB() int { +func (self *SHost) GetStorageSizeMB() int64 { return 0 } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/host.go index 761454a7873..5028d9d73a8 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/huawei/host.go @@ -137,7 +137,7 @@ func (self *SHost) GetMemSizeMB() int { return 0 } -func (self *SHost) GetStorageSizeMB() int { +func (self *SHost) GetStorageSizeMB() int64 { return 0 } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/host.go index b1f9d0f0c25..22c7b36de48 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/jdcloud/host.go @@ -154,7 +154,7 @@ func (h *SHost) GetMemSizeMB() int { return 0 } -func (h *SHost) GetStorageSizeMB() int { +func (h *SHost) GetStorageSizeMB() int64 { return 0 } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/host.go index f6cebf21762..26d5e7c1d98 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/nutanix/host.go @@ -405,9 +405,9 @@ func (self *SHost) GetMemSizeMB() int { return int(self.MemoryCapacityInBytes / 1024 / 1024) } -func (self *SHost) GetStorageSizeMB() int { +func (self *SHost) GetStorageSizeMB() int64 { sizeBytes, _ := strconv.Atoi(self.UsageStats.StorageCapacityBytes) - return sizeBytes / 1024 / 1024 + return int64(sizeBytes) / 1024 / 1024 } func (self *SHost) GetStorageType() string { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/hypervisor.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/hypervisor.go index b83189a9ba2..6a5c8474788 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/hypervisor.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/openstack/hypervisor.go @@ -68,7 +68,7 @@ type SHypervisor struct { HypervisorType string HypervisorVersion string Id string - LocalGB int + LocalGB int64 LocalGbUsed int MemoryMB int MemoryMbUsed int @@ -270,7 +270,7 @@ func (host *SHypervisor) GetMemSizeMB() int { return host.MemoryMB } -func (host *SHypervisor) GetStorageSizeMB() int { +func (host *SHypervisor) GetStorageSizeMB() int64 { return host.LocalGB * 1024 } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/host.go index afe7c0c43de..d80f32bc914 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/oracle/host.go @@ -78,7 +78,7 @@ func (self *SHost) GetMemSizeMB() int { return 0 } -func (self *SHost) GetStorageSizeMB() int { +func (self *SHost) GetStorageSizeMB() int64 { return 0 } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/host.go index eb5dc8cdba3..088810bf134 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/proxmox/host.go @@ -170,8 +170,8 @@ func (self *SHost) GetReservedMemoryMb() int { return 0 } -func (self *SHost) GetStorageSizeMB() int { - return int(self.Rootfs.Total / 1024 / 1024) +func (self *SHost) GetStorageSizeMB() int64 { + return self.Rootfs.Total / 1024 / 1024 } func (self *SHost) GetStorageType() string { diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/host.go index 9d4d503ecac..60e5f72f23d 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/qcloud/host.go @@ -192,7 +192,7 @@ func (self *SHost) GetMemSizeMB() int { return 0 } -func (self *SHost) GetStorageSizeMB() int { +func (self *SHost) GetStorageSizeMB() int64 { return 0 } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/host.go index a92090120f1..9e36a861bcf 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/remotefile/host.go @@ -40,7 +40,7 @@ type SHost struct { CpuDesc string CpuMbz int MemSizeMb int - StorageSizeMb int + StorageSizeMb int64 StorageType string AttachStorageTypes []string @@ -110,7 +110,7 @@ func (self *SHost) GetReservedMemoryMb() int { return 0 } -func (self *SHost) GetStorageSizeMB() int { +func (self *SHost) GetStorageSizeMB() int64 { return self.StorageSizeMb } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ucloud/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ucloud/host.go index 414948217b3..1ef88389791 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/ucloud/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/ucloud/host.go @@ -140,7 +140,7 @@ func (self *SHost) GetMemSizeMB() int { return 0 } -func (self *SHost) GetStorageSizeMB() int { +func (self *SHost) GetStorageSizeMB() int64 { return 0 } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/host.go index e9b9378ced3..3b1cbc47543 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/volcengine/host.go @@ -97,7 +97,7 @@ func (host *SHost) GetMemSizeMB() int { return 0 } -func (host *SHost) GetStorageSizeMB() int { +func (host *SHost) GetStorageSizeMB() int64 { return 0 } diff --git a/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/host.go b/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/host.go index 20e0621b23e..8a6051f0b2d 100644 --- a/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/host.go +++ b/vendor/yunion.io/x/cloudmux/pkg/multicloud/zstack/host.go @@ -235,7 +235,7 @@ func (host *SHost) GetMemSizeMB() int { return host.TotalMemoryCapacity / 1024 / 1024 } -func (host *SHost) GetStorageSizeMB() int { +func (host *SHost) GetStorageSizeMB() int64 { storages, err := host.zone.region.GetStorages(host.zone.UUID, host.ClusterUUID, "") if err != nil { return 0 @@ -252,7 +252,7 @@ func (host *SHost) GetStorageSizeMB() int { } } } - return totalStorage / 1024 / 1024 + return int64(totalStorage) / 1024 / 1024 } func (host *SHost) GetStorageType() string {