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

fix: server-create-params network boding config

Browse Source
This commit is contained in:
Zexi
2019-04-20 14:40:18 +08:00
parent d988e7dc41
commit 27ffbf8002
1 changed files with 17 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/compute/models/guests.go
+17 -4
View File
@@ -4262,11 +4262,23 @@ func (self *SGuest) ToNetworksConfig() []*api.NetworkConfig {
if len(guestNetworks) == 0 {
return nil
}
ret := make([]*api.NetworkConfig, len(guestNetworks))
for idx, guestNetwork := range guestNetworks {
ret := make([]*api.NetworkConfig, 0)
teamMacs := []string{}
for _, gn := range guestNetworks {
if tg, _ := gn.GetTeamGuestnetwork(); tg != nil {
teamMacs = append(teamMacs, gn.TeamWith)
}
}
for _, guestNetwork := range guestNetworks {
netConf := new(api.NetworkConfig)
network := guestNetwork.GetNetwork()
netConf.Index = int(guestNetwork.Index)
requireTeaming := false
if tg, _ := guestNetwork.GetTeamGuestnetwork(); tg != nil {
requireTeaming = true
}
if utils.IsInStringArray(guestNetwork.MacAddr, teamMacs) {
continue
}
// XXX: same wire
netConf.Wire = network.WireId
@@ -4275,8 +4287,9 @@ func (self *SGuest) ToNetworksConfig() []*api.NetworkConfig {
// netConf.Reserved
netConf.Driver = guestNetwork.Driver
netConf.BwLimit = guestNetwork.BwLimit
netConf.RequireTeaming = requireTeaming
// netConf.NetType
ret[idx] = netConf
ret = append(ret, netConf)
}
return ret
}