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

Merge pull request #4238 from zexi/bugfix/bm-register

Browse Source 
baremetal: fix register input params lost
This commit is contained in:
yunion-ci-robot
2019-12-20 00:16:07 +08:00
committed by GitHub
parent 9e68fcc3b2 8d82165f54
commit 3f636ef58a
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/mcclient/modules/mod_hosts.go
+5 -2
View File
@@ -88,10 +88,10 @@ func (this *HostManager) GetIpmiInfo(s *mcclient.ClientSession, id string, param
return ret, nil
}
func parseHosts(titles []string, data string) ([]jsonutils.JSONObject, string) {
func parseHosts(titles []string, data string) ([]*jsonutils.JSONDict, string) {
msg := ""
hosts := strings.Split(data, "\n")
ret := []jsonutils.JSONObject{}
ret := []*jsonutils.JSONDict{}
for i, host := range hosts {
host = strings.TrimSpace(host)
if len(host) == 0 {
@@ -122,6 +122,8 @@ func (this *HostManager) DoBatchRegister(s *mcclient.ClientSession, titles []str
if err != nil {
return nil, err
}
input := params.(*jsonutils.JSONDict)
input.Remove("hosts")
hosts, msg := parseHosts(titles, data)
if len(msg) > 0 {
@@ -130,6 +132,7 @@ func (this *HostManager) DoBatchRegister(s *mcclient.ClientSession, titles []str
results := make(chan modulebase.SubmitResult, len(hosts))
for _, host := range hosts {
host.Update(input)
go func(data jsonutils.JSONObject) {
ret, e := this.Create(s, data)
id, _ := data.GetString("access_mac")