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

scheduler: fix network filter specify is_public check

Browse Source
This commit is contained in:
Zexi
2019-06-15 17:23:33 +08:00
parent 1b8b1db31e
commit a323db0623
3 changed files with 26 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/scheduler/algorithm/predicates/network_schedtag_predicate.go
+24 -20
View File
@@ -88,30 +88,34 @@ func (p *NetworkSchedtagPredicate) IsResourceFitInput(u *core.Unit, _ core.Candi
return fmt.Errorf("Wire %s != %s", net.Wire, network.WireId)
}
}
netTypes := p.GetNetworkTypes(net.NetType)
if net.Network == "" && !utils.IsInStringArray(network.ServerType, netTypes) {
return fmt.Errorf("Network %s type %s not in %v", network.Name, network.ServerType, netTypes)
}
schedData := u.SchedData()
if net.Private {
if network.IsPublic {
return fmt.Errorf("Network %s is public", network.Name)
if net.Network == "" {
netTypes := p.GetNetworkTypes(net.NetType)
if !utils.IsInStringArray(network.ServerType, netTypes) {
return fmt.Errorf("Network %s type %s not in %v", network.Name, network.ServerType, netTypes)
}
if network.ProjectId != schedData.Project {
return fmt.Errorf("Network project %s not owner by %s", network.ProjectId, schedData.Project)
}
} else {
if !network.IsPublic {
return fmt.Errorf("Network %s is private", network.Name)
}
if rbacutils.TRbacScope(network.PublicScope) == rbacutils.ScopeDomain {
netDomain := network.DomainId
reqDomain := net.Domain
if netDomain != reqDomain {
return fmt.Errorf("Network domain scope %s not owner by %s", netDomain, reqDomain)
schedData := u.SchedData()
if net.Private {
if network.IsPublic {
return fmt.Errorf("Network %s is public", network.Name)
}
if network.ProjectId != schedData.Project {
return fmt.Errorf("Network project %s not owner by %s", network.ProjectId, schedData.Project)
}
} else {
if !network.IsPublic {
return fmt.Errorf("Network %s is private", network.Name)
}
if rbacutils.TRbacScope(network.PublicScope) == rbacutils.ScopeDomain {
netDomain := network.DomainId
reqDomain := net.Domain
if netDomain != reqDomain {
return fmt.Errorf("Network domain scope %s not owner by %s", netDomain, reqDomain)
}
}
}
}
if len(net.Address) > 0 {
ipAddr, err := netutils.NewIPV4Addr(net.Address)
if err != nil {