test/Rainbond
1
0
Fork 0
mirror of https://gitee.com/rainbond/Rainbond.git synced 2024-12-04 04:38:04 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge pull request #576 from GLYASAI/issue-#554

Browse Source 
[FIX] node uuid is null
This commit is contained in:
barnettZQG 2019-12-05 19:28:02 -06:00 committed by GitHub
commit 27dba89b95
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
util/ansible/node.go
View File

@ -57,7 +57,7 @@ func RunNodeInstallCmd(option NodeInstallOption) (err error) {
if err := preCheckNodeInstall(&option); err != nil {
return err
}
line := fmt.Sprintf("%s -r %s -i %s -t %s -k %s -u %s",
line := fmt.Sprintf("'%s' -r '%s' -i '%s' -t '%s' -k '%s' -u '%s'",
installNodeShellPath, option.HostRole, option.InternalIP, option.linkModel, option.loginValue, option.NodeID)
cmd := exec.Command("bash", "-c", line)
cmd.Stdin = option.Stdin

32
util/ansible/node_test.go Normal file
View File

@ -0,0 +1,32 @@
package ansible
import (
"testing"
)
func TestPreCheckNodeInstall(t *testing.T) {
tests := []struct {
name string
opt *NodeInstallOption
wanterr bool
}{
{
name: "empty node id",
opt: &NodeInstallOption{
HostRole: "host role",
InternalIP: "192.168.1.1",
RootPass: "root pass",
},
wanterr: true,
},
}
for idx := range tests {
tc := tests[idx]
t.Run(tc.name, func(t *testing.T) {
if err := preCheckNodeInstall(tc.opt); (err != nil) != tc.wanterr {
t.Errorf("want error: %v, but got %v", tc.wanterr, err)
}
})
}
}