opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-09-24 16:03:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(region): support create vmware vm with desc (#19739)

Browse Source
This commit is contained in:
屈轩
2024-03-18 09:47:14 +08:00
committed by GitHub
parent 9a5df8760d
commit af1e4a7d47
7 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
go.mod
+2 -2
View File
@@ -90,14 +90,14 @@ require (
k8s.io/cluster-bootstrap v0.19.3
k8s.io/cri-api v0.22.17
moul.io/http2curl/v2 v2.3.0
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240314033843-5935078cc5c5
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240315103713-2b552789fe40
yunion.io/x/executor v0.0.0-20230705125604-c5ac3141db32
yunion.io/x/jsonutils v1.0.1-0.20240203102553-4096f103b401
yunion.io/x/log v1.0.1-0.20240305175729-7cf2d6cd5a91
yunion.io/x/ovsdb v0.0.0-20230306173834-f164f413a900
yunion.io/x/pkg v1.10.1-0.20240303050651-73685b15a96e
yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e
yunion.io/x/sqlchemy v1.1.3-0.20240309151155-b34f29f02c79
yunion.io/x/sqlchemy v1.1.3-0.20240315065533-9ede1267a826
yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c
)
go.sum
+4 -4
View File
@@ -1212,8 +1212,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.20240314033843-5935078cc5c5 h1:MFldLYXlTgTx5cdQ2k1Id4Uj2lP3h1lkay0tVdbR17A=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240314033843-5935078cc5c5/go.mod h1:dsUESXIbXJ+/ywbNClhldOrbPOiBi2udrgOnB/ffoWk=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240315103713-2b552789fe40 h1:dbu387W13G0A9+35gCzjzOy2xAYxzpVW0NGpzIX4gXw=
yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240315103713-2b552789fe40/go.mod h1:dsUESXIbXJ+/ywbNClhldOrbPOiBi2udrgOnB/ffoWk=
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=
@@ -1231,7 +1231,7 @@ yunion.io/x/pkg v1.10.1-0.20240303050651-73685b15a96e h1:NuYu+z0dOT93aoNjg3W3PkL
yunion.io/x/pkg v1.10.1-0.20240303050651-73685b15a96e/go.mod h1:ksCJVQ+DwKrJ5QBEoU8pzrDFfDaZVAFH/iJ6yQCYxJk=
yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e h1:v+EzIadodSwkdZ/7bremd7J8J50Cise/HCylsOJngmo=
yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e/go.mod h1:0iFKpOs1y4lbCxeOmq3Xx/0AcQoewVPwj62eRluioEo=
yunion.io/x/sqlchemy v1.1.3-0.20240309151155-b34f29f02c79 h1:tY92xg+5hdsvVaqPpC1J/6LV9mDaeOBWbkxZkazwOLQ=
yunion.io/x/sqlchemy v1.1.3-0.20240309151155-b34f29f02c79/go.mod h1:5W8ghvJ4TNt/r2yDjjD3i4QsZgIiJX45dhRQBGWPHsQ=
yunion.io/x/sqlchemy v1.1.3-0.20240315065533-9ede1267a826 h1:RLPGmjYWGXmxL1rq9a/bs3VSp2tAwtVMxsa/uXOV2xI=
yunion.io/x/sqlchemy v1.1.3-0.20240315065533-9ede1267a826/go.mod h1:5W8ghvJ4TNt/r2yDjjD3i4QsZgIiJX45dhRQBGWPHsQ=
yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c h1:QuLab2kSRECZRxo4Lo2KcYn6XjQFDGaZ1+x0pYDVVwQ=
yunion.io/x/structarg v0.0.0-20231017124457-df4d5009457c/go.mod h1:EP6NSv2C0zzqBDTKumv8hPWLb3XvgMZDHQRfyuOrQng=
pkg/compute/models/baremetalagents.go
+1 -1
View File
@@ -48,7 +48,7 @@ type SBaremetalagent struct {
AgentType string `width:"32" charset:"ascii" nullable:"true" default:"baremetal" list:"admin" update:"admin" create:"admin_optional"`
Version string `width:"64" charset:"ascii" list:"admin" update:"admin" create:"admin_optional"` // Column(VARCHAR(64, charset='ascii'))
Version string `width:"128" charset:"ascii" list:"admin" update:"admin" create:"admin_optional"` // Column(VARCHAR(64, charset='ascii'))
StoragecacheId string `width:"36" charset:"ascii" nullable:"true" list:"admin" get:"admin" update:"admin" create:"admin_optional"`
DisableImageCache bool `default:"false" list:"admin" create:"admin_optional" update:"admin"`
vendor/modules.txt
Vendored
+2 -2
View File
@@ -1480,7 +1480,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.20240314033843-5935078cc5c5
# yunion.io/x/cloudmux v0.3.10-0-alpha.1.0.20240315103713-2b552789fe40
## explicit; go 1.18
yunion.io/x/cloudmux/pkg/apis
yunion.io/x/cloudmux/pkg/apis/billing
@@ -1633,7 +1633,7 @@ yunion.io/x/pkg/utils
# yunion.io/x/s3cli v0.0.0-20190917004522-13ac36d8687e
## explicit; go 1.12
yunion.io/x/s3cli
# yunion.io/x/sqlchemy v1.1.3-0.20240309151155-b34f29f02c79
# yunion.io/x/sqlchemy v1.1.3-0.20240315065533-9ede1267a826
## explicit; go 1.17
yunion.io/x/sqlchemy
yunion.io/x/sqlchemy/backends
vendor/yunion.io/x/cloudmux/pkg/multicloud/esxi/host.go
Generated Vendored
+3
View File
@@ -769,6 +769,7 @@ func (host *SHost) CreateVM(desc *cloudprovider.SManagedVMCreateConfig) (cloudpr
type SCreateVMParam struct {
Name string
Desc string `json:"description"`
Uuid string
OsName string
CpuSockets int
@@ -1062,6 +1063,7 @@ func (host *SHost) DoCreateVM(ctx context.Context, ds *SDatastore, params SCreat
spec := types.VirtualMachineConfigSpec{
Name: name,
Annotation: params.Desc,
Version: version,
Uuid: params.Uuid,
GuestId: guestId,
@@ -1299,6 +1301,7 @@ func (host *SHost) CloneVM(ctx context.Context, from *SVirtualMachine, snapshot
perSocket := params.Cpu / params.CpuSockets
spec := types.VirtualMachineConfigSpec{
Name: name,
Annotation: params.Desc,
Uuid: params.Uuid,
NumCPUs: int32(params.Cpu),
NumCoresPerSocket: int32(perSocket),
vendor/yunion.io/x/sqlchemy/debug.go
Generated Vendored
+1 -1
View File
@@ -30,7 +30,7 @@ var (
func sqlDebug(key, sqlstr string, variables []interface{}) {
sqlstr = _sqlDebug(sqlstr, variables)
if key == "" {
key = "SQUery"
key = "SQuery"
}
log.Debugln(key, sqlstr)
}
vendor/yunion.io/x/sqlchemy/reflect.go
Generated Vendored
+1 -1
View File
@@ -64,7 +64,7 @@ func GetStringValue(dat interface{}) string {
case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64:
return fmt.Sprintf("%d", value.Uint())
case reflect.Float32, reflect.Float64:
return fmt.Sprintf("%f", value.Float())
return fmt.Sprintf("%v", value.Float())
case reflect.String:
return value.String()
}