From 67a0073b2f579ffbe77ce4ac6ec89066e9eccf64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=B1=88=E8=BD=A9?= Date: Sun, 26 Dec 2021 09:02:28 +0800 Subject: [PATCH] fix(region): host name validate with generate name (#12980) --- pkg/compute/models/guests.go | 6 +++++- pkg/compute/models/hosts.go | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/pkg/compute/models/guests.go b/pkg/compute/models/guests.go index f9fd73a84a..bc03552a2f 100644 --- a/pkg/compute/models/guests.go +++ b/pkg/compute/models/guests.go @@ -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 } diff --git a/pkg/compute/models/hosts.go b/pkg/compute/models/hosts.go index 832ea66f29..443cc097a5 100644 --- a/pkg/compute/models/hosts.go +++ b/pkg/compute/models/hosts.go @@ -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 }