opensource/cloudpods
3
0
Fork 0
mirror of https://github.com/yunionio/cloudpods.git synced 2026-11-05 15:31:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Automatic merge from release/2.3.0 -> release/2.4.0

Browse Source 
* commit '98a2d9a212ee03cca3a8f1beba13a337e77fb610':
  scheduler: 兼容 v2 region 的输入
This commit is contained in:
邱剑
2018-11-26 13:37:51 +08:00
parent 6be6de02bf 98a2d9a212
commit 97dc17ff08
2 changed files with 14 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/scheduler/algorithm/predicates/guest/network_predicate.go
+1 -1
View File
@@ -151,7 +151,7 @@ func (p *NetworkPredicate) Execute(u *core.Unit, c core.Candidater) (bool, []cor
continue
}
if !(n.Idx == net.ID || n.Idx == net.Name) {
//errMsgs = append(errMsgs, fmt.Sprintf("%v(%v): id/name not matched", net.Name, net.ID))
errMsgs = append(errMsgs, fmt.Sprintf("%v(%v): id/name not matched", net.Name, net.ID))
} else if !(net.IsPublic || net.TenantID == d.OwnerTenantID) {
errMsgs = append(errMsgs, fmt.Sprintf("%v(%v): not owner (%v != %v)", net.Name, net.ID, net.TenantID, d.OwnerTenantID))
} else if !(net.Ports > 0 || isMigrate()) {
pkg/scheduler/api/sched.go
+13 -2
View File
@@ -369,8 +369,19 @@ func (d *SchedData) fillNetworksInfo(sjson *simplejson.Json) error {
break
}
net, err := newNetworkFromDesc(s.MustString())
if err != nil {
return err
if err != nil || net.Idx == "" {
net = new(Network)
net.Idx = s.Get("network").MustString()
if net.Idx == "" {
return fmt.Errorf("Invalid network desc: %s", s.MustString())
}
net.Wire = s.Get("wire").MustString()
net.Driver = s.Get("driver").MustString()
net.Exit = s.Get("exit").MustBool()
net.BwLimit = s.Get("bw_limit").MustInt64()
net.Private = s.Get("private").MustBool()
net.Reserved = s.Get("reserved").MustBool()
net.Vip = s.Get("vip").MustBool()
}
networks = append(networks, net)
}