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

fix(region): host name validate with generate name (#12980)

Browse Source
This commit is contained in:
屈轩
2021-12-26 09:02:28 +08:00
committed by GitHub
parent 5c8b9b0215
commit 67a0073b2f
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guests.go
+5 -1
View File
@@ -1490,7 +1490,11 @@ func (manager *SGuestManager) validateCreateData(
if err != nil {
return nil, err
}
input.HostnameInput, err = manager.SHostnameResourceBaseManager.ValidateHostname(input.Name, input.OsType, input.HostnameInput)
name := input.Name
if len(name) == 0 {
name = input.GenerateName
}
input.HostnameInput, err = manager.SHostnameResourceBaseManager.ValidateHostname(name, input.OsType, input.HostnameInput)
if err != nil {
return nil, err
}
pkg/compute/models/hosts.go
+5 -1
View File
@@ -3413,7 +3413,11 @@ func (manager *SHostManager) ValidateCreateData(
if err != nil {
return input, errors.Wrap(err, "SEnabledStatusInfrasResourceBaseManager.ValidateCreateData")
}
input.HostnameInput, err = manager.SHostnameResourceBaseManager.ValidateHostname(input.Name, "", input.HostnameInput)
name := input.Name
if len(name) == 0 {
name = input.GenerateName
}
input.HostnameInput, err = manager.SHostnameResourceBaseManager.ValidateHostname(name, "", input.HostnameInput)
if err != nil {
return input, err
}