Skip to content

Commit

Permalink
VERSION 4.3.1
Browse files Browse the repository at this point in the history
修复n9ev3上获取交换机列表的数量问题
  • Loading branch information
freedomkk-qfeng committed Oct 21, 2020
1 parent 397a0bc commit 2602e46
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 24 deletions.
50 changes: 27 additions & 23 deletions funcs/n9ev3.go
Original file line number Diff line number Diff line change
Expand Up @@ -29,30 +29,34 @@ type N9eV3Host struct {
}

func GetN9eV3NodeHosts(nodeID int64) (hosts []N9eV3Host, err error) {

apiAddr := fmt.Sprintf("%s/api/rdb/node/%d/resources", g.Config().N9eV3.Addr, nodeID)
headers := map[string]string{}
headers["x-user-token"] = g.Config().N9eV3.Token
var res []byte
res, err = HTTPGet(apiAddr, headers)
if err != nil {
return
}
var n9eV3Res EcmcRes
if err = json.Unmarshal(res, &n9eV3Res); err != nil {
return
}
if n9eV3Res.Err != "" {
err = errors.New(n9eV3Res.Err)
return
}
var nodeHosts N9eV3NodeHosts
if err = json.Unmarshal(n9eV3Res.Dat, &nodeHosts); err != nil {
return
p := 1
for {
apiAddr := fmt.Sprintf("%s/api/rdb/node/%d/resources?p=%d", g.Config().N9eV3.Addr, nodeID, p)
headers := map[string]string{}
headers["x-user-token"] = g.Config().N9eV3.Token
var res []byte
res, err = HTTPGet(apiAddr, headers)
if err != nil {
return
}
var n9eV3Res EcmcRes
if err = json.Unmarshal(res, &n9eV3Res); err != nil {
return
}
if n9eV3Res.Err != "" {
err = errors.New(n9eV3Res.Err)
return
}
var nodeHosts N9eV3NodeHosts
if err = json.Unmarshal(n9eV3Res.Dat, &nodeHosts); err != nil {
return
}
if len(nodeHosts.List) == 0 {
break
}
hosts = append(hosts, nodeHosts.List...)
p = p + 1
}

hosts = nodeHosts.List

return
}

Expand Down
2 changes: 1 addition & 1 deletion g/const.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,6 @@ import (
// 4.2.0 support get allip from ecmc nodes
// 4.3.0 support get allip from n9ev3
const (
VERSION = "4.3.0"
VERSION = "4.3.1"
COLLECT_INTERVAL = time.Second
)

0 comments on commit 2602e46

Please sign in to comment.