From 2c5a77ff1f8fae003a210460b870f53e30605be9 Mon Sep 17 00:00:00 2001 From: wubijie Date: Fri, 15 Nov 2024 17:20:49 +0800 Subject: [PATCH] add GetDNSFileByUUID func --- configmanage/server/internal/dnsfile.go | 6 ++++++ configmanage/server/service/dns_test.go | 24 ++++++++++++++++++++++++ configmanage/server/service/ssh.go | 2 +- 3 files changed, 31 insertions(+), 1 deletion(-) diff --git a/configmanage/server/internal/dnsfile.go b/configmanage/server/internal/dnsfile.go index 7e74ff87..a9d4ccd1 100644 --- a/configmanage/server/internal/dnsfile.go +++ b/configmanage/server/internal/dnsfile.go @@ -58,3 +58,9 @@ func GetDNSFileByInfoUUID(uuid string, isindex interface{}) (DNSFile, error) { err := db.MySQL().Model(&DNSFile{}).Where("config_info_uuid=?", uuid).Find(&file).Error return file, err } + +func GetDNSFileByUUID(uuid string) (DNSFile, error) { + var file DNSFile + err := db.MySQL().Model(&DNSFile{}).Where("uuid=?", uuid).Find(&file).Error + return file, err +} diff --git a/configmanage/server/service/dns_test.go b/configmanage/server/service/dns_test.go index f6ba3b3f..01b97521 100644 --- a/configmanage/server/service/dns_test.go +++ b/configmanage/server/service/dns_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/google/uuid" + "openeuler.org/PilotGo/configmanage-plugin/internal" ) func TestDNSConfig_Record(t *testing.T) { @@ -27,3 +28,26 @@ func TestDNSConfig_Record(t *testing.T) { os.Exit(-1) } } + +func TestDNSConfig_Load(t *testing.T) { + // 设置测试数据 + dc := &DNSConfig{ + ConfigInfoUUID: "cd1574a4-cdad-4a55-9561-9ef371456b90", + } + err := dc.Load() + if err != nil { + fmt.Printf("record error: %s\n", err) + os.Exit(-1) + } + fmt.Printf("hc: %v\n", dc) +} + +func TestGetDNSFileByUUID(t *testing.T) { + uuid := "a134a449-d635-4f08-8dd8-1e3de2a6a509" + df, err := internal.GetDNSFileByUUID(uuid) + if err != nil { + fmt.Printf("get dnsfile error: %s\n", err) + os.Exit(-1) + } + fmt.Printf("hc: %v\n", df) +} diff --git a/configmanage/server/service/ssh.go b/configmanage/server/service/ssh.go index 0f03686f..a0158af2 100644 --- a/configmanage/server/service/ssh.go +++ b/configmanage/server/service/ssh.go @@ -85,7 +85,7 @@ func (sc *SSHConfig) Load() error { func (sc *SSHConfig) Apply() ([]NodeResult, error) { // 从数据库获取下发的信息 - sf, err := internal.GetHostFileByUUID(sc.UUID) + sf, err := internal.GetSSHFileByUUID(sc.UUID) if err != nil { return nil, err } -- Gitee